[CalendarServer-changes] [13699] CalDAVTester/trunk/scripts

source_changes at macosforge.org source_changes at macosforge.org
Fri Jun 27 13:08:05 PDT 2014


Revision: 13699
          http://trac.calendarserver.org//changeset/13699
Author:   cdaboo at apple.com
Date:     2014-06-27 13:08:04 -0700 (Fri, 27 Jun 2014)
Log Message:
-----------
Clean out default/unused XML element attributes.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/conditional.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/depthreports.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/dropbox.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/errors-big-calendars.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/freebusy.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicit-traveltime.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitacls.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitcopymove.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitdefaultcalendar.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-calendaruserproxy.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicit.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicitauto.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/prefer.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/proppatch.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/proxyauthz.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulenomore.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostacl.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/servertoserveroutgoing.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-sync.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-traveltime.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/webcal.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/ab-client.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/errors.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/get.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/limits.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/proppatch.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/put.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
    CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-calendars.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-create.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-freebusy.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-invites.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-managed-attachments.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-multiple.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-data.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-properties.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-propfind.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-replies.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-multiget.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-sync.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-unshare.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-webcal.xml
    CalDAVTester/trunk/scripts/tests-pod/CalDAV/simple.xml

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/acl.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -162,10 +162,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Read ACLs' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Read ACLs'>
+		<test name='1'>
 			<description>PROPFIND existing VEVENT</description>
-			<request print-response='yes' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>PROPFIND</method>
 				<ruri>$calendars:</ruri>
 				<header>
@@ -200,9 +200,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND without DAV:read-acl or DAV:read-current-user-privilege-set</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendars:</ruri>
 				<header>
@@ -237,9 +237,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for schedule privilege on iTIP Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -263,9 +263,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for schedule privilege on iTIP Outbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -289,9 +289,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for lack of schedule privilege on regular calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -320,10 +320,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PROPFIND interaction with ACL' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PROPFIND interaction with ACL'>
+		<test name='1'>
 			<description>PROPFIND all calendars</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -343,9 +343,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND: prinicpal-collection-set test</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -367,10 +367,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='ACL method preconditions' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='ACL method preconditions'>
+		<test name='1'>
 			<description>Failure when DAV:write-acl not granted</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarhome2:/</ruri>
 				<data>
@@ -386,7 +386,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
@@ -399,7 +399,7 @@
 					<filepath>Resource/CalDAV/acls/20.xml</filepath>
 				</data>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -415,12 +415,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>DAV:no-ace-conflict precondition failure - attempt to set inherited ACE</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -436,12 +436,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>DAV:no-protected-ace-conflict precondition failure - attempt to change protected ACE</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -457,12 +457,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>DAV:no-inherited-ace-conflict precondition failure - attempt to change inherited ACE</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -478,12 +478,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>DAV:deny-before-grant precondition failure - attempt to deny before grant a set of ACEs</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -499,12 +499,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>DAV:not-supported-privilege precondition failure - attempt to use unsupported privilege</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -520,12 +520,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>DAV:recognized-principal precondition failure - attempt to use unknown principal</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -541,12 +541,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>Valid command</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -562,12 +562,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>Valid command</description>
-			<request print-response='no'>
+			<request>
 				<method>ACL</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -585,10 +585,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='COPY/MOVE interaction with ACL' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='COPY/MOVE interaction with ACL'>
+		<test name='1'>
 			<description>COPY to non-writeable shared calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -604,9 +604,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>COPY to non-visible shared calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -622,9 +622,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>COPY to non-visible shared calendar with overwrite</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -644,9 +644,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>COPY to visible with no overwrite shared calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -662,9 +662,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>COPY to writeable shared calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -680,9 +680,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>MOVE to non-writeable shared calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -698,9 +698,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>MOVE to non-visible shared calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -716,9 +716,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>MOVE to non-visible shared calendar with overwrite</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -738,9 +738,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>MOVE to writeable shared calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -758,10 +758,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Principal Properties' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Principal Properties'>
+		<test name='1'>
 			<description>PROPFIND principal VEVENT</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<header>
@@ -785,7 +785,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check for proper capability in DAV header</description>
 			<request>
 				<method>OPTIONS</method>
@@ -806,10 +806,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Directory list access' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Directory list access'>
+		<test name='1'>
 			<description>Get calendar home collection</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome2:/</ruri>
 				<verify>
@@ -822,12 +822,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>Get calendar collection</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome2:/visibletouser01/</ruri>
 				<verify>
@@ -845,10 +845,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='ACL calendar collection inheritance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='ACL calendar collection inheritance'>
+		<test name='1'>
 			<description>Check that read is not set</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/calreadtoauth/</ruri>
 				<header>
@@ -868,9 +868,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check that read is not inherited</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/calreadtoauth/1.ics</ruri>
 				<header>
@@ -890,7 +890,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Set read on collection only</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>ACL</method>
@@ -904,9 +904,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check that read is set</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/calreadtoauth/</ruri>
 				<header>
@@ -926,9 +926,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check that read is inherited</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/calreadtoauth/1.ics</ruri>
 				<header>
@@ -950,13 +950,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='ACL regular collection no inheritance' ignore='no'>
+	<test-suite name='ACL regular collection no inheritance'>
 		<require-feature>
 			<feature>regular-collection</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Check that read is not set</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/colreadtoauth/</ruri>
 				<header>
@@ -976,9 +976,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check that read is not inherited</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/colreadtoauth/1.ics</ruri>
 				<header>
@@ -998,7 +998,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Set read on collection only</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>ACL</method>
@@ -1012,9 +1012,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check that read is set</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/colreadtoauth/</ruri>
 				<header>
@@ -1034,9 +1034,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check that read is inherited</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/colreadtoauth/1.ics</ruri>
 				<header>
@@ -1058,8 +1058,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='ACL calendar home' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='ACL calendar home'>
+		<test name='1'>
 			<description>Set read/read-current-user-privilege-set on home only</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>ACL</method>
@@ -1077,9 +1077,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check for current-user-privilege-set on calendar home as user01</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -1099,9 +1099,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check that calendar privileges are still inherited for user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/calreadtoauth/</ruri>
 				<header>
@@ -1122,7 +1122,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Remove read/read-current-user-privilege-set on home only</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>ACL</method>
@@ -1140,9 +1140,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check property access on calendar home as user01</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -1162,9 +1162,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check that calendar privileges are still inherited for user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/calreadtoauth/</ruri>
 				<header>
@@ -1187,8 +1187,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Tests on missing resources' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Tests on missing resources'>
+		<test name='1'>
 			<description>Get on non-existent inaccessible resource</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -1202,7 +1202,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Get on existing inaccessible resource</description>
 			<request>
 				<method>PUT</method>
@@ -1227,7 +1227,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Unauthenticated get on non-existent inaccessible resource</description>
 			<request auth="no">
 				<method>GET</method>
@@ -1241,7 +1241,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Unauthenticated get on existing inaccessible resource</description>
 			<request auth="no">
 				<method>GET</method>
@@ -1255,7 +1255,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Bogus authenticated get on non-existent inaccessible resource</description>
 			<request user="$useradmin:" pswd="foobar">
 				<method>GET</method>
@@ -1269,7 +1269,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Bogus authenticated get on existing inaccessible resource</description>
 			<request user="$useradmin:" pswd="foobar">
 				<method>GET</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/aclreports.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -52,15 +52,15 @@
 		</request>
 	</start>
 	
-	<test-suite name='acl-principal-prop-set REPORT' ignore='no'>
+	<test-suite name='acl-principal-prop-set REPORT'>
 
 		<require-feature>
 			<feature>acl-principal-prop-set REPORT</feature>
 		</require-feature>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -80,9 +80,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -102,9 +102,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>No DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -124,9 +124,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Too many DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -142,9 +142,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No DAV:read-acl privilege</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<data>
@@ -160,9 +160,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Valid report</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -187,15 +187,15 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='principal-match REPORT' ignore='no'>
+	<test-suite name='principal-match REPORT'>
 
 		<require-feature>
 			<feature>principal-match REPORT</feature>
 		</require-feature>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<header>
@@ -215,9 +215,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<header>
@@ -237,9 +237,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Too many DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -256,9 +256,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Valid self report with DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -278,9 +278,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Valid self report without DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -300,9 +300,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Valid principal-search report with DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -318,9 +318,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Valid principal-search report without DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -336,9 +336,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>principal-search with inaccessible property</description>
-			<request print-response='no' user='$userid2:' pswd='$pswd2:'>
+			<request user='$userid2:' pswd='$pswd2:'>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -356,15 +356,15 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='principal-property-search REPORT' ignore='no'>
+	<test-suite name='principal-property-search REPORT'>
 
 		<require-feature>
 			<feature>principal-property-search REPORT</feature>
 		</require-feature>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<header>
@@ -384,9 +384,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<header>
@@ -406,9 +406,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Valid non-apply-to report with DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -429,9 +429,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Valid non-apply-to report without DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -452,9 +452,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Valid apply-to report with DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -478,9 +478,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Valid non-apply-to report without DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -506,7 +506,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Extended principal-property-search REPORT' ignore='no'>
+	<test-suite name='Extended principal-property-search REPORT'>
 
 		<require-feature>
 			<feature>extended-principal-search</feature>
@@ -514,7 +514,7 @@
 
 		<test name='1' ignore='yes'> <!-- No more first/last name -->
 			<description>Valid INDIVIDUAL first-name AND last-name search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -536,7 +536,7 @@
 		</test>
 		<test name='2' ignore='yes'> <!-- No more first/last name -->
 			<description>Valid INDIVIDUAL first-name OR last-name search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -557,9 +557,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Valid ROOM displayname search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -579,9 +579,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Valid RESOURCE displayname search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -603,7 +603,7 @@
 		</test>
 		<test name='5' ignore='yes'> <!-- No more first/last name -->
 			<description>Valid INDIVIDUAL first-name OR last-name search report - limit 1</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -634,9 +634,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Invalid INDIVIDUAL first-name OR last-name search report - limit bogus</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -652,9 +652,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Invalid INDIVIDUAL first-name OR last-name search report - limit bogus</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -670,9 +670,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Invalid search report - test attribute bogus</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -688,9 +688,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Invalid search report - type attribute bogus</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -706,9 +706,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Invalid search report - caseless attribute bogus</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -724,9 +724,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Invalid search report - match-type attribute bogus</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -744,7 +744,7 @@
 		</test>
 		<test name='12' ignore='yes'> <!-- No more first/last name -->
 			<description>Valid INDIVIDUAL first-name search report - limit 5</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -767,9 +767,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>"equals" calendar-user-address-set REPORT</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -789,9 +789,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Invalid CUA in calendar-user-address-set REPORT</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -809,15 +809,15 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='principal-search-property-set REPORT' ignore='no'>
+	<test-suite name='principal-search-property-set REPORT'>
 
 		<require-feature>
 			<feature>principal-search-property-set REPORT</feature>
 		</require-feature>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<header>
@@ -837,9 +837,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<header>
@@ -859,9 +859,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Report on non-principal collection</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -877,9 +877,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Valid report</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -900,11 +900,11 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='supported-report-set property' ignore='no'>
+	<test-suite name='supported-report-set property'>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Regular resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -966,9 +966,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Regular resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principals_users:</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/add-member.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -75,10 +75,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='POST VEVENT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='POST VEVENT'>
+		<test name='1'>
 			<description>POST non-recurring timed event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/$add-member:</ruri>
 				<data>
@@ -105,7 +105,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<request>
 				<method>GET</method>
 				<ruri>$posted:</ruri>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/attachments.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,7 +28,7 @@
 	<start/>
 	
 	<test-suite name='Inline'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>VEVENT with image/jpeg</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -53,7 +53,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>VTODO with image/jpeg</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -81,7 +81,7 @@
 	</test-suite>
 
 	<test-suite name='External'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>VEVENT with http://</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -106,7 +106,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>VTODO with image/jpeg</description>
 			<request end-delete='yes'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/availability.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -64,8 +64,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='Capabilities' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Capabilities'>
+		<test name='1'>
 			<description>Check for proper capability in DAV header</description>
 			<request>
 				<method>OPTIONS</method>
@@ -83,9 +83,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>VAVAILABILITY and VJOURNAL are not supported components</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -125,7 +125,7 @@
 	
 	<!--
 	<test-suite name='Verify PUT VAVAILABILITY' ignore='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT availability</description>
 			<request>
 				<method>GET</method>
@@ -142,7 +142,7 @@
 	</test-suite>
 
 	<test-suite name='basic query reports' ignore='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>query for resources with VCALENDAR &amp; VAVAILABILITY defined</description>
 			<request>
 				<method>REPORT</method>
@@ -161,7 +161,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for resources with VCALENDAR &amp; VEVENT defined</description>
 			<request>
 				<method>REPORT</method>
@@ -178,7 +178,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for resources with VCALENDAR &amp; VEVENT or VAVAILABILITY defined</description>
 			<request>
 				<method>REPORT</method>
@@ -201,7 +201,7 @@
 	</test-suite>
 	
 	<test-suite name='time-range query reports' ignore='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>query for VAVAILABILITYs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -220,7 +220,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for VAVAILABILITYs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -237,7 +237,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for VAVAILABILITYs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -254,7 +254,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for VAVAILABILITYs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -271,7 +271,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for VEVENTs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -288,7 +288,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query for VEVENTs and VAVAILABILITYs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -309,9 +309,9 @@
 	</test-suite>
 
 	<test-suite name='free-busy reports' ignore='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>query for free busy with time range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
@@ -332,9 +332,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for free busy with time range with an overridden available component</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
@@ -351,9 +351,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for free busy with time range unbounded start availability</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
@@ -373,9 +373,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for free busy with time range unbounded end availability</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
@@ -399,7 +399,7 @@
 	-->
 
 	<test-suite name='Verify cannot PUT VAVAILABILITY'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT availability fails</description>
 			<request>
 				<method>PUT</method>
@@ -419,8 +419,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PROPPATCH VAVAILABILITY' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PROPPATCH VAVAILABILITY'>
+		<test name='1'>
 			<description>PROPFIND no availability</description>
 			<request>
 				<method>PROPFIND</method>
@@ -442,7 +442,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPPATCH invalid availability</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -460,9 +460,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH valid availability</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -480,10 +480,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='free-busy reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='free-busy reports'>
+		<test name='1'>
 			<description>query for free busy with time range</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -504,7 +504,7 @@
 	</test-suite>
 
 	<end>
-		<request print-response="no">
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$inboxpath1:/</ruri>
 			<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/bulk.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -77,13 +77,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Simple POST - one event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Simple POST - one event'>
+		<test name='1'>
 			<description>POST single new event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/1.ics</filepath>
 				</data>
@@ -109,7 +109,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -130,12 +130,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single existing event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/2.ics</filepath>
 				</data>
@@ -149,7 +149,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -170,12 +170,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST single new different event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/3.ics</filepath>
 				</data>
@@ -201,7 +201,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -222,7 +222,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -234,13 +234,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Simple POST - multiple events' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Simple POST - multiple events'>
+		<test name='1'>
 			<description>POST multiple new events</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/4.ics</filepath>
 				</data>
@@ -269,7 +269,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -290,7 +290,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -311,12 +311,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST one new, one exsting events</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/7.ics</filepath>
 				</data>
@@ -345,7 +345,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check unchanged</description>
 			<request>
 				<method>GET</method>
@@ -366,7 +366,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -387,7 +387,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -399,17 +399,17 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Simple POST - one event return data' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Simple POST - one event return data'>
+		<test name='1'>
 			<description>POST single new event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
 					<name>X-MobileMe-DAV-Options</name>
 					<value>return-changed-data</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/9.ics</filepath>
 				</data>
@@ -434,7 +434,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -455,7 +455,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -467,7 +467,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Simple POST - ctag condition' ignore='no'>
+	<test-suite name='Simple POST - ctag condition'>
 		<test name='1'>
 			<description>PROPFIND on calendar</description>
 			<request>
@@ -490,9 +490,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST single new event conditional fail</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -503,7 +503,7 @@
 					<name>If</name>
 					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:123>]]></value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/9.ics</filepath>
 				</data>
@@ -516,9 +516,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single new event conditional ok</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -529,7 +529,7 @@
 					<name>If</name>
 					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:>]]></value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/simple/9.ics</filepath>
 				</data>
@@ -569,7 +569,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -581,13 +581,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='CRUD POST - one event create' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='CRUD POST - one event create'>
+		<test name='1'>
 			<description>POST single new event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-one/1.xml</filepath>
 				</data>
@@ -613,7 +613,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -634,12 +634,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single existing event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-one/3.xml</filepath>
 				</data>
@@ -653,7 +653,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -674,12 +674,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>POST single new different event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-one/4.xml</filepath>
 				</data>
@@ -705,7 +705,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -726,7 +726,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -738,13 +738,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='CRUD POST - multiple' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='CRUD POST - multiple'>
+		<test name='1'>
 			<description>POST single new event</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-multiple/1.xml</filepath>
 				</data>
@@ -770,7 +770,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -791,12 +791,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST add new and update existing</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-multiple/3.xml</filepath>
 				</data>
@@ -824,7 +824,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Data changed</description>
 			<request>
 				<method>GET</method>
@@ -845,7 +845,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -866,12 +866,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>POST delete and update existing</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-multiple/6.xml</filepath>
 				</data>
@@ -897,7 +897,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Data changed</description>
 			<request>
 				<method>GET</method>
@@ -918,7 +918,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Data gone</description>
 			<request>
 				<method>GET</method>
@@ -932,7 +932,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -944,13 +944,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='CRUD POST - multiple if-match' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='CRUD POST - multiple if-match'>
+		<test name='1'>
 			<description>POST two new events</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-ifmatch/1.xml</filepath>
 				</data>
@@ -979,7 +979,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1000,7 +1000,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1021,12 +1021,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST new, update and delete existing - if-match fail</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-ifmatch/4.xml</filepath>
 				</data>
@@ -1055,7 +1055,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1076,7 +1076,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1097,7 +1097,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1118,12 +1118,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>POST update and delete existing - if-match ok</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/bulk/crud-ifmatch/6.xml</filepath>
 				</data>
@@ -1149,7 +1149,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Data gone</description>
 			<request>
 				<method>GET</method>
@@ -1163,7 +1163,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Data changed</description>
 			<request>
 				<method>GET</method>
@@ -1184,7 +1184,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1205,7 +1205,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/calendaruserproxy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -819,7 +819,7 @@
 		</test>
 		<test name='2'>
 			<description>Valid self report with DAV:prop</description>
-			<request user='$userid2:' pswd='$pswd2:' print-response='no'>
+			<request user='$userid2:' pswd='$pswd2:'>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/conditional.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/conditional.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/conditional.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,11 +27,11 @@
 
 	<start/>
 	
-	<test-suite name='Last_modified handling' ignore='no'>
+	<test-suite name='Last_modified handling'>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Regular PROPFIND</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -56,17 +56,17 @@
 			</request>
 		</test>
 
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Regular PROPFIND</description>
-			<request print-response='no'>
+			<request>
 				<method>DELAY</method>
 				<ruri>2</ruri>
 			</request>
 		</test>
 
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Conditional PROPFIND</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/copymove.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -123,9 +123,9 @@
 			<feature>no-duplicate-uids</feature>
 		</exclude-feature>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>COPY within same calendar to new resource</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -142,7 +142,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>COPY within same calendar to existing resource with overwrite</description>
 			<request>
 				<method>COPY</method>
@@ -165,7 +165,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>COPY within same calendar to existing resource without overwrite</description>
 			<request>
 				<method>COPY</method>
@@ -190,7 +190,7 @@
 		</test>
 		<test name='4'>
 			<description>COPY to different calendar, new resource</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -316,7 +316,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='MOVE' ignore='no'>
+	<test-suite name='MOVE'>
 
 		<require-feature>
 			<feature>MOVE Method</feature>
@@ -387,7 +387,7 @@
 		</test>
 		<test name='4'>
 			<description>MOVE to different calendar, new resource</description>
-			<request print-response='yes'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/move1.ics</ruri>
 				<header>
@@ -428,7 +428,7 @@
 				<feature>no-duplicate-uids</feature>
 			</exclude-feature>
 			<description>MOVE to different calendar, existing resource with overwrite</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<header>
@@ -495,7 +495,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='COPY/MOVE and Properties' ignore='no'>
+	<test-suite name='COPY/MOVE and Properties'>
 
 		<require-feature>
 			<feature>COPY Method</feature>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/ctag.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -65,7 +65,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='PUT/DELETE/COPY/MOVE' ignore='no'>
+	<test-suite name='PUT/DELETE/COPY/MOVE'>
 		<test name='1'>
 			<description>Check for CTag</description>
 			<request>
@@ -478,7 +478,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Scheduling' ignore='no'>
+	<test-suite name='Scheduling'>
 		<test name='1'>
 			<description>Check for CTag on calendar</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/current-user-principal.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,8 +28,8 @@
 
 	<start/>
 	
-	<test-suite name='Check for the property on /' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Check for the property on /'>
+		<test name='1'>
 			<description>Check for authenticated property on /</description>
 			<request>
 				<method>PROPFIND</method>
@@ -51,7 +51,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check for unauthenticated property on /</description>
 			<request auth="no">
 				<method>PROPFIND</method>
@@ -86,7 +86,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for authenticated property on / (user02)</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
@@ -110,8 +110,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Check for the property on /principals/' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Check for the property on /principals/'>
+		<test name='1'>
 			<description>Check for authenticated property on /</description>
 			<request>
 				<method>PROPFIND</method>
@@ -133,7 +133,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check for unauthenticated property on /</description>
 			<request auth="no">
 				<method>PROPFIND</method>
@@ -155,7 +155,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for authenticated property on / (user02)</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/default-alarms.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag on calendar home</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarhome1:/</ruri>
 				<verify>
@@ -45,7 +45,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for options header tag on calendar</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -355,8 +355,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PUT'>
+		<test name='1'>
 			<description>PUT non-recurring timed event - alarm added from home</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -388,7 +388,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT non-recurring all-day event - no alarm added</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -420,7 +420,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PUT non-recurring timed todo - alarm added from calendar</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -452,7 +452,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT recurring timed event - alarms added from home</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -484,7 +484,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PUT non-recurring timed event with alarm</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -518,7 +518,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Shared calendars - initially empty default' ignore='no'>
+	<test-suite name='Shared calendars - initially empty default'>
 		<test name='1'>
 			<description>Good property on home</description>
 			<request user="$userid2:" pswd="$pswd2:">
@@ -541,7 +541,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 creates calendar for sharing</description>
 			<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
 				<method>MKCALENDAR</method>
@@ -551,9 +551,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<data>
@@ -567,11 +567,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee notification collection</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -585,10 +585,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/default-alarms/sharing/3.xml</filepath>
 				</data>
@@ -648,9 +648,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>PUT sharer alarm added, none for sharee</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome2:/shared/1.ics</ruri>
 				<data>
@@ -691,9 +691,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>PUT sharee no alarm, none for sharer</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/2.ics</ruri>
 				<data>
@@ -758,10 +758,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Scheduling' ignore='no'>
+	<test-suite name='Scheduling'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<data>
@@ -775,7 +775,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<verify>
@@ -789,14 +789,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -826,7 +826,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT with ACTION:NONE' ignore='no'>
+	<test-suite name='PUT with ACTION:NONE'>
 		<test name='1'>
 			<description>Set ACTION:NONE on home</description>
 			<request>
@@ -849,7 +849,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT non-recurring timed event - no alarm added from home</description>
 			<request end-delete='yes'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/delete.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,7 +27,7 @@
 	</require-feature>
 
 	<start>
-		<request end-delete="yes" print-response="yes">
+		<request end-delete="yes">
 			<method>PUT</method>
 			<ruri>$calendarpath1:/1.ics</ruri>
 			<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/depthreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/depthreports.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/depthreports.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -223,13 +223,13 @@
 		</request>
 	</start>
 	
-	<test-suite name='multiget reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='multiget reports'>
+		<test name='1'>
 			<description>multiget on calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/depth1.txt</filepath>
 				</data>
@@ -245,12 +245,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>multiget on collection</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/depth2.txt</filepath>
 				</data>
@@ -273,12 +273,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>multiget on calendar resource</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/depth3.txt</filepath>
 				</data>
@@ -299,12 +299,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>multiget on non calendar resource</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/depth4.txt</filepath>
 				</data>
@@ -319,8 +319,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='basic query reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='basic query reports'>
+		<test name='1'>
 			<description>query on calendar with no Depth</description>
 			<request>
 				<method>REPORT</method>
@@ -343,7 +343,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query on calendar with Depth 0</description>
 			<request>
 				<method>REPORT</method>
@@ -370,7 +370,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query on calendar with Depth 1</description>
 			<request>
 				<method>REPORT</method>
@@ -397,7 +397,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query on calendar with Depth infinity</description>
 			<request>
 				<method>REPORT</method>
@@ -424,7 +424,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query on collection with no Depth</description>
 			<request>
 				<method>REPORT</method>
@@ -438,7 +438,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query on collection with Depth 0</description>
 			<request>
 				<method>REPORT</method>
@@ -456,9 +456,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query on collection with Depth 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<header>
@@ -484,7 +484,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query on collection with Depth infinity</description>
 			<request>
 				<method>REPORT</method>
@@ -513,9 +513,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query on matching calendar resource with no Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/1.ics</ruri>
 				<data>
@@ -535,7 +535,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>query on non-matching calendar resource with no Depth</description>
 			<request>
 				<method>REPORT</method>
@@ -549,7 +549,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>query on non calendar resource with no Depth</description>
 			<request>
 				<method>REPORT</method>
@@ -569,10 +569,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='free-busy reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='free-busy reports'>
+		<test name='1'>
 			<description>query for free busy on calendar with no Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/</ruri>
 				<data>
@@ -600,9 +600,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for free busy on calendar with Depth 0</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/</ruri>
 				<header>
@@ -634,9 +634,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for free busy on calendar with Depth 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/</ruri>
 				<header>
@@ -668,9 +668,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for free busy on calendar with Depth infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/</ruri>
 				<header>
@@ -702,9 +702,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for free busy on collection with no Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<data>
@@ -716,9 +716,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query for free busy on collection with Depth 0</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<header>
@@ -734,9 +734,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query for free busy on collection with Depth 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<header>
@@ -769,9 +769,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query for free busy on collection with Depth infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<header>
@@ -805,9 +805,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query for free busy on resource</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/calendar/1.ics</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/depthreportsacl.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -224,17 +224,17 @@
 		</request>
 	</start>
 	
-	<test-suite name='Reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Reports'>
+		<test name='1'>
 			<description>multiget on top collection</description>
-			<request user='$userid2:' pswd='$pswd2:' print-response='no'>
+			<request user='$userid2:' pswd='$pswd2:'>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/depthreportsacl/4.xml</filepath>
 				</data>
@@ -258,16 +258,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query on top collection</description>
-			<request user='$userid2:' pswd='$pswd2:' print-response='no'>
+			<request user='$userid2:' pswd='$pswd2:'>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/depthreportsacl/5.xml</filepath>
 				</data>
@@ -280,9 +280,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for free busy on collection with Depth infinity</description>
-			<request user='$userid2:' pswd='$pswd2:' print-response='no'>
+			<request user='$userid2:' pswd='$pswd2:'>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/top-collection/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/dropbox.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/dropbox.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -353,7 +353,7 @@
 		</test>
 		<test name='13'>
 			<description>Grant write permission to attendee.</description>
-			<request print-response='yes' user="$userid1:" pswd="$pswd1:">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/encodedURIs.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -44,7 +44,7 @@
 				<method>MKCOL</method>
 				<ruri>$calendarhome1:/collection 1/</ruri>
 			</request>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection 1/2 a.ics</ruri>
 				<data>
@@ -69,7 +69,7 @@
 				<feature>COPY Method</feature>
 			</require-feature>
 			<description>COPY</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/collection 1/2 a.ics</ruri>
 				<header>
@@ -87,7 +87,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/collection 1/2_2 a.ics</ruri>
 				<header>
@@ -119,7 +119,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>MOVE</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/collection 1/2 a.ics</ruri>
 				<header>
@@ -137,7 +137,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/collection 1/2_2 a.ics</ruri>
 				<header>
@@ -169,7 +169,7 @@
 	<test-suite name='calendar resource'>
 		<test name='1'>
 			<description>PUT</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2 a.ics</ruri>
 				<data>
@@ -190,7 +190,7 @@
 		</test>
 		<test name='2'>
 			<description>PROPFIND</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -216,7 +216,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget REPORT</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -243,7 +243,7 @@
 				<feature>no-duplicate-uids</feature>
 			</exclude-feature>
 			<description>COPY</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/2 a.ics</ruri>
 				<header>
@@ -261,7 +261,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/calendar 2/2_2 a.ics</ruri>
 				<header>
@@ -293,7 +293,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>MOVE</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/2 a.ics</ruri>
 				<header>
@@ -311,7 +311,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/calendar 3/2_3 a.ics</ruri>
 				<header>
@@ -343,7 +343,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>multiget REPORT on encoded calendar collection path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/</ruri>
 				<data>
@@ -367,7 +367,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>multiget REPORT on encoded calendar resource path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/2_3 a.ics</ruri>
 				<data>
@@ -391,7 +391,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>multiget REPORT on encoded collection path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -415,7 +415,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>query REPORT on encoded calendar path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/</ruri>
 				<data>
@@ -439,7 +439,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>free-busy REPORT on encoded calendar path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/</ruri>
 				<data>
@@ -456,7 +456,7 @@
 	<test-suite name='calendar resource double-encoded'>
 		<test name='1'>
 			<description>PUT</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3%20a.ics</ruri>
 				<data>
@@ -477,7 +477,7 @@
 		</test>
 		<test name='2'>
 			<description>PROPFIND</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -503,7 +503,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget REPORT</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -530,7 +530,7 @@
 				<feature>no-duplicate-uids</feature>
 			</exclude-feature>
 			<description>COPY</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/3%20a.ics</ruri>
 				<header>
@@ -548,7 +548,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/calendar 2/3_2%20a.ics</ruri>
 				<header>
@@ -580,7 +580,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>MOVE</description>
-			<request print-response='no' end-delete='yes'>
+			<request end-delete='yes'>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/3%20a.ics</ruri>
 				<header>
@@ -598,7 +598,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/calendar 3/3_3%20a.ics</ruri>
 				<header>
@@ -630,7 +630,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>multiget REPORT on encoded calendar collection path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/</ruri>
 				<data>
@@ -654,7 +654,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>multiget REPORT on encoded calendar resource path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/3_3%20a.ics</ruri>
 				<data>
@@ -678,7 +678,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>multiget REPORT on encoded collection path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -702,7 +702,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>query REPORT on encoded calendar path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/</ruri>
 				<data>
@@ -727,7 +727,7 @@
 				<feature>MOVE Method</feature>
 			</require-feature>
 			<description>free-busy REPORT on encoded calendar path</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar 3/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors-big-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors-big-calendars.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors-big-calendars.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,10 +27,10 @@
 
 	<start/>
 	
-	<test-suite name='REPORT/too big' ignore='no'>
+	<test-suite name='REPORT/too big'>
 		<test name='1'>
 			<description>add one event to make it a 1001 event calendar</description>
-			<request user="$userid9:" pswd="$pswd9:" end-delete="yes" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:" end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarhome9:/calendar.1000/abc.ics</ruri>
 				<data>
@@ -41,7 +41,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid9:" pswd="$pswd9:" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:">
 				<method>REPORT</method>
 				<ruri>$calendarhome9:/calendar.1000/</ruri>
 				<data>
@@ -59,7 +59,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget with too many results</description>
-			<request user="$userid9:" pswd="$pswd9:" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:">
 				<method>REPORT</method>
 				<ruri>$calendarhome9:/calendar.1000/</ruri>
 				<data>
@@ -77,7 +77,7 @@
 		</test>
 		<test name='3'>
 			<description>free-busy with too many results</description>
-			<request user="$userid9:" pswd="$pswd9:" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:">
 				<method>REPORT</method>
 				<ruri>$calendarhome9:/calendar.1000/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/errors.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -262,7 +262,7 @@
 		</test>
 		<test name='6'>
 			<description>PUT with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -280,7 +280,7 @@
 		</test>
 		<test name='7'>
 			<description>PUT with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -298,7 +298,7 @@
 		</test>
 		<test name='8' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>PUT with too many recurrence instances to new resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -316,7 +316,7 @@
 		</test>
 		<test name='9' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>PUT with too many recurrence instances to existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -337,7 +337,7 @@
 				<feature>timezones-by-reference</feature>
 			</exclude-feature>
 			<description>PUT without timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -355,7 +355,7 @@
 		</test>
 		<test name='11'>
 			<description>PUT invalid RRULE</description>
-			<request end-delete="yes" print-response='no'>
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/33.ics</ruri>
 				<data>
@@ -373,7 +373,7 @@
 		</test>
 		<test name='12' ignore='yes'> <!-- PyCalendar merges similar components for now -->
 			<description>PUT duplicate RECURRENCE-ID</description>
-			<request end-delete="yes" print-response='no'>
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/34.ics</ruri>
 				<data>
@@ -391,7 +391,7 @@
 		</test>
 		<test name='13'>
 			<description>PUT bad escape sequence</description>
-			<request end-delete="yes" print-response='no'>
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/34.ics</ruri>
 				<data>
@@ -409,7 +409,7 @@
 		</test>
 		<test name='14' ignore="yes"> <!-- Test disabled for Leopard iCal workaround -->
 			<description>PUT invalid master/Recurrence-ID</description>
-			<request end-delete="yes" print-response='no'>
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/37.ics</ruri>
 				<data>
@@ -427,7 +427,7 @@
 		</test>
 		<test name='15' ignore="yes"> <!-- Test disabled for Leopard iCal workaround -->
 			<description>PUT invalid master/Recurrence-ID</description>
-			<request end-delete="yes" print-response='no'>
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/38.ics</ruri>
 				<data>
@@ -445,7 +445,7 @@
 		</test>
 		<test name='16'>
 			<description>PUT with too many attendees to new resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -463,7 +463,7 @@
 		</test>
 		<test name='17'>
 			<description>PUT with invalid recurrence id</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<data>
@@ -483,7 +483,7 @@
 		     in the calendar data.
 		<test name='18'>
 			<description>PUT with bad organizer property</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<data>
@@ -615,7 +615,7 @@
 				<feature>timezones-by-reference</feature>
 			</require-feature>
 			<description>PUT with missing timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -747,7 +747,7 @@
 				<feature>regular-collection</feature>
 			</require-feature>
 			<description>COPY with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/6.ics</ruri>
 				<header>
@@ -768,7 +768,7 @@
 				<feature>no-duplicate-uids</feature>
 			</exclude-feature>
 			<description>COPY from calendar with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/calendar2/6.ics</ruri>
 				<header>
@@ -789,7 +789,7 @@
 				<feature>regular-collection</feature>
 			</require-feature>
 			<description>COPY with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/7.ics</ruri>
 				<header>
@@ -807,7 +807,7 @@
 		</test>
 		<test name='9' ignore="yes">
 			<description>COPY from calendar with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/calendar2/7.ics</ruri>
 				<header>
@@ -825,7 +825,7 @@
 		</test>
 		<test name='10' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>COPY with too many recurrence instances to new resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/8.ics</ruri>
 				<header>
@@ -843,7 +843,7 @@
 		</test>
 		<test name='11' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>COPY with too many recurrence instances to existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/9.ics</ruri>
 				<header>
@@ -1014,7 +1014,7 @@
 				<feature>regular-collection</feature>
 			</require-feature>
 			<description>MOVE with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/6.ics</ruri>
 				<header>
@@ -1035,7 +1035,7 @@
 				<feature>no-duplicate-uids</feature>
 			</exclude-feature>
 			<description>MOVE from calendar with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/calendar2/6.ics</ruri>
 				<header>
@@ -1056,7 +1056,7 @@
 				<feature>regular-collection</feature>
 			</require-feature>
 			<description>MOVE with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/7.ics</ruri>
 				<header>
@@ -1074,7 +1074,7 @@
 		</test>
 		<test name='9'>
 			<description>MOVE from calendar with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/calendar2/7.ics</ruri>
 				<header>
@@ -1092,7 +1092,7 @@
 		</test>
 		<test name='10' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>MOVE with too many recurrence instances to new resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/8.ics</ruri>
 				<header>
@@ -1110,7 +1110,7 @@
 		</test>
 		<test name='11' ignore="yes"> <!-- RRULE's now truncated -->
 			<description>MOVE with too many recurrence instances to existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/9.ics</ruri>
 				<header>
@@ -1170,7 +1170,7 @@
 	<test-suite name='REPORT/calendar-data'>
 		<test name='1'>
 			<description>query with invalid calendar-data content-type</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1245,7 +1245,7 @@
 	<test-suite name='REPORT/filter'>
 		<test name='1'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1263,7 +1263,7 @@
 		</test>
 		<test name='2'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1281,7 +1281,7 @@
 		</test>
 		<test name='3'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1299,7 +1299,7 @@
 		</test>
 		<test name='4'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1317,7 +1317,7 @@
 		</test>
 		<test name='5'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1335,7 +1335,7 @@
 		</test>
 		<test name='6'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1353,7 +1353,7 @@
 		</test>
 		<test name='7'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1371,7 +1371,7 @@
 		</test>
 		<test name='8'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1389,7 +1389,7 @@
 		</test>
 		<test name='9'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1407,7 +1407,7 @@
 		</test>
 		<test name='10'>
 			<description>query with invalid time-range (dates)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1425,7 +1425,7 @@
 		</test>
 		<test name='11'>
 			<description>query with invalid time-range (floating)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1443,7 +1443,7 @@
 		</test>
 		<test name='12'>
 			<description>free-busy with invalid time-range (dates)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1461,7 +1461,7 @@
 		</test>
 		<test name='13'>
 			<description>free-busy with invalid time-range (floating)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1482,7 +1482,7 @@
 	<test-suite name='Invalid CalDAV:timezone'>
 		<test name='1'>
 			<description>query with invalid timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1500,7 +1500,7 @@
 		</test>
 		<test name='2'>
 			<description>proppatch with invalid timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1521,7 +1521,7 @@
 	<test-suite name='Invalid urn: calendar user address'>
 		<test name='1'>
 			<description>POST free busy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -1542,7 +1542,7 @@
 	<test-suite name='Root resource'>
 		<test name='1'>
 			<description>DELETE /</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$root:</ruri>
 				<verify>
@@ -1556,7 +1556,7 @@
 		</test>
 		<test name='2'>
 			<description>COPY /</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$root:</ruri>
 				<header>
@@ -1574,7 +1574,7 @@
 		</test>
 		<test name='3'>
 			<description>MOVE /</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$root:</ruri>
 				<header>
@@ -1592,7 +1592,7 @@
 		</test>
 		<test name='4'>
 			<description>GET //</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$root://</ruri>
 				<verify>
@@ -1605,7 +1605,7 @@
 	<test-suite name='Unauthenticated versus Forbidden'>
 		<test name='1'>
 			<description>Existing user with incorrect password</description>
-			<request user="$userid1:" pswd="bogus" print-response='no'>
+			<request user="$userid1:" pswd="bogus">
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -1619,7 +1619,7 @@
 		</test>
 		<test name='2'>
 			<description>Non-Existing user</description>
-			<request user="bogus" pswd="bogus" print-response='no'>
+			<request user="bogus" pswd="bogus">
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/expandproperty.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='Basic REPORT' ignore='no'>
+	<test-suite name='Basic REPORT'>
 		<test name='1'>
 			<description>OK property query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -53,7 +53,7 @@
 		</test>
 		<test name='2'>
 			<description>Missing property query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -71,7 +71,7 @@
 		</test>
 		<test name='3'>
 			<description>Two OK properties (one empty) query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -89,10 +89,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Access Control' ignore='no'>
+	<test-suite name='Access Control'>
 		<test name='1'>
 			<description>Set property to point to someone else's calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -106,7 +106,7 @@
 		</test>
 		<test name='2'>
 			<description>Try query against accessible href</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -135,7 +135,7 @@
 		</test>
 		<test name='3'>
 			<description>Try query against inaccessible href</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -164,7 +164,7 @@
 		</test>
 		<test name='4'>
 			<description>Reset property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -178,10 +178,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Invalid REPORTs' ignore='no'>
+	<test-suite name='Invalid REPORTs'>
 		<test name='1'>
 			<description>Wrong Depth 1</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principal1:</ruri>
 				<header>
@@ -203,7 +203,7 @@
 		</test>
 		<test name='2'>
 			<description>Wrong Depth infinity</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principal1:</ruri>
 				<header>
@@ -225,7 +225,7 @@
 		</test>
 		<test name='3'>
 			<description>Multi-expand not supported</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -243,10 +243,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Membership REPORT' ignore='no'>
+	<test-suite name='Membership REPORT'>
 		<test name='1'>
 			<description>Non-expanding group-member-set query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$gprincipaluri4:</ruri>
 				<data>
@@ -296,7 +296,7 @@
 		</test>
 		<test name='2'>
 			<description>Expanding group-member-set query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$gprincipaluri4:</ruri>
 				<data>
@@ -370,7 +370,7 @@
 				<feature>only-proxy-groups</feature>
 			</exclude-feature>
 			<description>Non-expanding group-membership query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principaluri21:</ruri>
 				<data>
@@ -409,7 +409,7 @@
 				<feature>only-proxy-groups</feature>
 			</exclude-feature>
 			<description>Expanding group-membership query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principaluri21:</ruri>
 				<data>
@@ -448,7 +448,7 @@
 				<feature>only-proxy-groups</feature>
 			</require-feature>
 			<description>Non-expanding group-membership query limited to proxy groups</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principaluri21:</ruri>
 				<data>
@@ -487,7 +487,7 @@
 				<feature>only-proxy-groups</feature>
 			</require-feature>
 			<description>Expanding group-membership query limited to proxy groups</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$principaluri21:</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/extended-freebusy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,7 +29,7 @@
 
 	<start>
 		<!-- Add user01 as read delegate for user02 -->
-		<request user="$userid2:" pswd="$pswd2:" print-response="no">
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>PROPPATCH</method>
 			<ruri>$principal2:calendar-proxy-read/</ruri>
 			<data>
@@ -38,7 +38,7 @@
 			</data>
 		</request>
 		<!-- Add user01 as read-write delegate for user03 -->
-		<request user="$userid3:" pswd="$pswd3:" print-response="no">
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>PROPPATCH</method>
 			<ruri>$principal3:calendar-proxy-write/</ruri>
 			<data>
@@ -88,10 +88,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Freebusy by organizer as a delegate' ignore="no">
+	<test-suite name='Freebusy by organizer as a delegate'>
 		<test name='1'>
 			<description>POST free busy for all attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -159,7 +159,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy for all attendees - repeat to check on any caching</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -230,7 +230,7 @@
 	<test-suite name='Freebusy by delegate as an organizer'>
 		<test name='1'>
 			<description>POST free busy by delegate for all attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
 				<data>
@@ -298,7 +298,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy for all attendees - repeat to check on any caching</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
 				<data>
@@ -366,10 +366,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Freebusy by non-delegate' ignore="no">
+	<test-suite name='Freebusy by non-delegate'>
 		<test name='1'>
 			<description>POST free busy for all attendees</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>
@@ -438,7 +438,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy for all attendees - repeat to check on any caching</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>
@@ -507,10 +507,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Freebusy by delegate after change' ignore="no">
+	<test-suite name='Freebusy by delegate after change'>
 		<test name='1'>
 			<description>POST free busy for all attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -576,7 +576,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>New event</description>
 			<request user="$userid2:" pswd="$pswd2:" end-delete='yes'>
 				<method>PUT</method>
@@ -592,7 +592,7 @@
 		</test>
 		<test name='3'>
 			<description>POST free busy for all attendees - repeat to check on any caching</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -660,10 +660,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Freebusy on location by delegate' ignore="no">
+	<test-suite name='Freebusy on location by delegate'>
 		<test name='1'>
 			<description>POST free busy for all attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -710,7 +710,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy for all attendees - repeat to check on any caching</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -757,10 +757,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Freebusy on location by non-delegate' ignore="no">
+	<test-suite name='Freebusy on location by non-delegate'>
 		<test name='1'>
 			<description>POST free busy for all attendees</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>
@@ -807,7 +807,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy for all attendees - repeat to check on any caching</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>
@@ -857,7 +857,7 @@
 	<test-suite name='Freebusy by delegate as an organizer - private event'>
 		<test name='1'>
 			<description>PUT private event</description>
-			<request user="$userid2:" pswd="$pswd2:" end-delete = 'yes' print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" end-delete = 'yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath2:/3.ics</ruri>
 				<data>
@@ -871,7 +871,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy by delegate for all attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
 				<data>
@@ -905,7 +905,7 @@
 		</test>
 		<test name='3'>
 			<description>POST free busy for all attendees - repeat to check on any caching</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
 				<data>
@@ -940,7 +940,7 @@
 	</test-suite>
 
 	<end>
-		<request user="$userid2:" pswd="$pswd2:" print-response="no">
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>PROPPATCH</method>
 			<ruri>$principal2:calendar-proxy-read/</ruri>
 			<data>
@@ -948,7 +948,7 @@
 				<filepath>Resource/CalDAV/extended-freebusy/9.xml</filepath>
 			</data>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response="no">
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>PROPPATCH</method>
 			<ruri>$principal3:calendar-proxy-write/</ruri>
 			<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/floating.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -153,7 +153,7 @@
 	</start>
 	
 	<test-suite name='REPORT floating behaviour - calendar without timezone'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>REPORT on non-recurring timed/floating events: US/Eastern</description>
 			<request>
 				<method>REPORT</method>
@@ -178,7 +178,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
@@ -202,7 +202,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
@@ -231,7 +231,7 @@
 	</test-suite>
 	
 	<test-suite name='REPORT floating behaviour - calendar with timezone'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>REPORT on non-recurring timed/floating events: no timezone</description>
 			<request>
 				<method>REPORT</method>
@@ -256,7 +256,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>REPORT on non-recurring timed/floating events: US/Eastern</description>
 			<request>
 				<method>REPORT</method>
@@ -281,7 +281,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
@@ -308,9 +308,9 @@
 	</test-suite>
 	
 	<test-suite name='REPORT floating behaviour - collection'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>REPORT on non-recurring timed/floating events: no timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -341,7 +341,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>REPORT on non-recurring timed/floating events: US/Eastern</description>
 			<request>
 				<method>REPORT</method>
@@ -374,7 +374,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>REPORT on non-recurring timed/floating events: US/Pacific</description>
 			<request>
 				<method>REPORT</method>
@@ -408,9 +408,9 @@
 	</test-suite>
 	
 	<test-suite name='REPORT floating behaviour - expand'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>REPORT on non-recurring timed/floating events: no timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -442,9 +442,9 @@
 	</test-suite>
 
 	<test-suite name='REPORT free-busy floating behaviour'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>free-busy on collection without timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar-none/</ruri>
 				<header>
@@ -470,9 +470,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>free-busy on collection with timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/calendar-us/</ruri>
 				<data>
@@ -494,9 +494,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>free-busy on multiple collections with/without timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -524,10 +524,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Floating DTSTART with RRULE:UNTIL' ignore='no'>
+	<test-suite name='Floating DTSTART with RRULE:UNTIL'>
 		<test name='1'>
 			<description>Store resource</description>
-			<request print-response='no' end-delete="yes">
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/7.ics</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/freebusy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/freebusy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -38,13 +38,13 @@
 		</request>
 	</start>
 	
-	<test-suite name='Freebusy - mixed timed and all-day' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Freebusy - mixed timed and all-day'>
+		<test name='1'>
 			<description>PUT timed event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/freebusy/1.ics</filepath>
 				</data>
@@ -53,12 +53,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT all-day event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/freebusy/2.ics</filepath>
 				</data>
@@ -69,10 +69,10 @@
 		</test>
 		<test name='3'>
 			<description>POST free busy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/freebusy/3.ics</filepath>
 				</data>
@@ -91,10 +91,10 @@
 		</test>
 		<test name='4'>
 			<description>POST free busy - again from cache</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/freebusy/3.ics</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/get.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -96,7 +96,7 @@
 				<feature>directory listing</feature>
 			</require-feature>
 			<description>GET on calendar collection with listing</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -196,7 +196,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -232,7 +232,7 @@
 				<feature>directory listing</feature>
 			</require-feature>
 			<description>GET on calendar collection with listing</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -253,7 +253,7 @@
 		</test>
 		<test name='6'>
 			<description>Conditional GET on calendar collection</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -271,7 +271,7 @@
 		</test>
 		<test name='7'>
 			<description>Conditional GET on calendar collection</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -292,7 +292,7 @@
                 <feature>directory listing</feature>
             </require-feature>
             <description>Update of displayname property</description>
-            <request print-response="no">
+            <request>
                 <method>PROPPATCH</method>
                 <ruri>$calendarpath1:/</ruri>
                 <data>
@@ -307,7 +307,7 @@
                     </arg>
                 </verify>
             </request>
-            <request print-response="no">
+            <request>
                 <method>PROPFIND</method>
                 <ruri>$calendarpath1:/</ruri>
                 <header>
@@ -326,7 +326,7 @@
                     </arg>
                 </verify>
             </request>
-            <request print-response="no">
+            <request>
                 <method>GET</method>
                 <ruri>$calendarpath1:/</ruri>
                 <verify>
@@ -346,7 +346,7 @@
                 <feature>directory listing</feature>
             </require-feature>
             <description>Another update of displayname property</description>
-            <request print-response="no">
+            <request>
                 <method>PROPPATCH</method>
                 <ruri>$calendarpath1:/</ruri>
                 <data>
@@ -361,7 +361,7 @@
                     </arg>
                 </verify>
             </request>
-            <request print-response="no">
+            <request>
                 <method>PROPFIND</method>
                 <ruri>$calendarpath1:/</ruri>
                 <header>
@@ -380,7 +380,7 @@
                     </arg>
                 </verify>
             </request>
-            <request print-response="no">
+            <request>
                 <method>GET</method>
                 <ruri>$calendarpath1:/</ruri>
                 <verify>
@@ -469,7 +469,7 @@
 		</test>
 		<test name='4'>
 			<description>Conditional GET on calendar home</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -487,7 +487,7 @@
 		</test>
 		<test name='5'>
 			<description>Conditional GET on calendar home</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/ical-client.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,7 +27,7 @@
 
 	<start/>
 	
-	<test-suite name='Account setup - client 1' ignore='no'>
+	<test-suite name='Account setup - client 1'>
 		<test name='1'>
 			<description>PROPFIND principal - no authentication</description>
 			<request auth="no">
@@ -74,10 +74,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Polling - client 1' ignore='no'>
+	<test-suite name='Polling - client 1'>
 		<test name='1'>
 			<description>PROPFIND calendar home</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -99,7 +99,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Account setup - client 2' ignore='no'>
+	<test-suite name='Account setup - client 2'>
 		<test name='1'>
 			<description>PROPFIND principal - no authentication</description>
 			<request auth="no">
@@ -146,10 +146,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Polling - client 2' ignore='no'>
+	<test-suite name='Polling - client 2'>
 		<test name='1'>
 			<description>PROPFIND calendar home</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicit-traveltime.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicit-traveltime.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicit-traveltime.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -129,7 +129,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/1.ics</filepath>
 				</data>
@@ -162,7 +162,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/2.ics</filepath>
 				</data>
@@ -195,7 +195,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/3.ics</filepath>
 				</data>
@@ -266,7 +266,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/1.ics</filepath>
 				</data>
@@ -299,7 +299,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/2.ics</filepath>
 				</data>
@@ -332,7 +332,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/3.ics</filepath>
 				</data>
@@ -403,7 +403,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/1.ics</filepath>
 				</data>
@@ -436,7 +436,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/2.ics</filepath>
 				</data>
@@ -469,7 +469,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/3.ics</filepath>
 				</data>
@@ -540,7 +540,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/1.ics</filepath>
 				</data>
@@ -573,7 +573,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/2.ics</filepath>
 				</data>
@@ -606,7 +606,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/implicit/traveltime/freebusy/3.ics</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitacls.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitacls.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitacls.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='Default Inbox/Outbox privileges' ignore='no'>
+	<test-suite name='Default Inbox/Outbox privileges'>
 		<test name='1'>
 			<description>Look for CALDAV:schedule-send on Outbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -54,7 +54,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for CALDAV:schedule-send on Outbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -77,10 +77,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Inbox/Outbox supported-privilege-set' ignore='no'>
+	<test-suite name='Inbox/Outbox supported-privilege-set'>
 		<test name='1'>
 			<description>Look for CALDAV:schedule-send on Outbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -103,7 +103,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for CALDAV:schedule-send on Outbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitallday.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,10 +37,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Simple Changes' ignore='no'>
+	<test-suite name='Simple Changes'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -54,7 +54,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -68,14 +68,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -89,14 +89,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -110,14 +110,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -131,7 +131,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer changes Summary</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -145,7 +145,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -159,14 +159,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -180,14 +180,14 @@
 		</test>
 		<test name='15'>
 			<description>Attendee -> Declined</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -201,14 +201,14 @@
 		</test>
 		<test name='16'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='17'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -238,10 +238,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Attendee Recurrence Override' ignore='no'>
+	<test-suite name='Attendee Recurrence Override'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -255,7 +255,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -269,14 +269,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -290,14 +290,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted/Declined</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -311,14 +311,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -332,7 +332,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer changes Summary</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -346,7 +346,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -360,14 +360,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -381,14 +381,14 @@
 		</test>
 		<test name='15'>
 			<description>Attendee -> Declined</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -402,14 +402,14 @@
 		</test>
 		<test name='16'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='17'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitattendeedelete.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -136,7 +136,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -202,7 +202,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -224,7 +224,7 @@
 		</test>
 		<test name='13'>
 			<description>Attendee 2 has no data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -285,7 +285,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -307,7 +307,7 @@
 		</test>
 		<test name='18'>
 			<description>Attendee 2 has no data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -516,7 +516,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -638,7 +638,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -935,7 +935,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -1057,7 +1057,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1453,7 +1453,7 @@
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto1.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -62,8 +62,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Non-recurring without conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Non-recurring without conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -77,16 +77,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -98,16 +98,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -119,9 +119,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -141,9 +141,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -155,7 +155,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -172,17 +172,17 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#2 Update to previous request - no change in time' ignore='no'>
+	<test-suite name='#2 Update to previous request - no change in time'>
 		<test name='1'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -194,16 +194,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One items in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -215,9 +215,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -237,9 +237,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -251,9 +251,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -273,9 +273,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -287,7 +287,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -304,8 +304,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#3 Non-recurring with conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Non-recurring with conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>DELAY</method>
@@ -323,16 +323,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -344,16 +344,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -365,9 +365,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -387,9 +387,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -401,7 +401,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -418,8 +418,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#4 Recurring with non-recurring conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#4 Recurring with non-recurring conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -433,16 +433,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -454,16 +454,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -475,9 +475,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -497,9 +497,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -511,7 +511,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -528,8 +528,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#5 Recurring without conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#5 Recurring without conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -543,16 +543,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>
@@ -564,16 +564,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -585,9 +585,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -607,9 +607,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -621,7 +621,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -638,8 +638,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#6 Non-recurring with recurring conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#6 Non-recurring with recurring conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -653,16 +653,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -674,16 +674,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -695,9 +695,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -717,9 +717,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -731,7 +731,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -748,8 +748,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#7 Recurring with recurring conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#7 Recurring with recurring conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -763,16 +763,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<verify>
@@ -784,16 +784,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -805,9 +805,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -827,9 +827,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -841,7 +841,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -858,10 +858,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#8 Cancel non-recurring ' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#8 Cancel non-recurring '>
+		<test name='1'>
 			<description>getctag on resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<header>
@@ -878,9 +878,9 @@
 				</grabproperty>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>getctag on resource01 inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -897,9 +897,9 @@
 				</grabproperty>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Six items in user02 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -919,9 +919,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Six items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<header>
@@ -941,13 +941,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Cancel event</description>
 			<request>
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request print-response="yes">
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -959,9 +959,9 @@
 				<ruri>4</ruri>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -981,9 +981,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -995,16 +995,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Six items in user02 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -1024,9 +1024,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1038,9 +1038,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -1060,9 +1060,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Five items in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<header>
@@ -1082,9 +1082,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Test getctag on resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<header>
@@ -1104,9 +1104,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>getctag on resource01 inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -1126,7 +1126,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto10.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -54,8 +54,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Non-recurring' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Non-recurring'>
+		<test name='1'>
 			<description>Create new blocking event - just resource</description>
 			<request>
 				<method>PUT</method>
@@ -69,16 +69,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -90,9 +90,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource08 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath8:/</ruri>
 				<header>
@@ -112,9 +112,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource08 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath8:/</ruri>
 				<verify>
@@ -127,7 +127,7 @@
 				<graburi>$r1:</graburi>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Create new conflicting event with attendee</description>
 			<request>
 				<method>PUT</method>
@@ -141,9 +141,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -163,9 +163,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -177,16 +177,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -198,16 +198,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>One item in resource08 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$rinboxpath8:/</ruri>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>One item in resource08 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath8:/</ruri>
 				<verify>
@@ -220,7 +220,7 @@
 				<graburi>$r2:</graburi>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Cancel blocking event</description>
 			<request>
 				<method>DELETE</method>
@@ -230,9 +230,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>No items in resource08 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath8:/</ruri>
 				<header>
@@ -252,13 +252,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>No item in resource08 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$rcalendarpath8:/</ruri>
 			</request>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$r1:</ruri>
 				<verify>
@@ -272,14 +272,14 @@
 		</test>
 		<test name='16'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -291,16 +291,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
+		<test name='17'>
 			<description>One item in user01 Inbox - no reply from resource</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -312,9 +312,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='19'>
 			<description>One item in resource08 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GET</method>
 				<ruri>$r2:</ruri>
 				<verify>
@@ -326,7 +326,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20' ignore='no'>
+		<test name='20'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -340,16 +340,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='21'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='22' ignore='no'>
+		<test name='22'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -361,9 +361,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23' ignore='no'>
+		<test name='23'>
 			<description>No items in resource08 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath8:/</ruri>
 				<header>
@@ -383,9 +383,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24' ignore='no'>
+		<test name='24'>
 			<description>One item in resource08 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath8:/</ruri>
 				<verify>
@@ -397,7 +397,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto11.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -54,8 +54,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Non-recurring' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Non-recurring'>
+		<test name='1'>
 			<description>Create recurring event - resource invited to two instances only</description>
 			<request>
 				<method>PUT</method>
@@ -69,16 +69,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -90,9 +90,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -112,9 +112,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -127,7 +127,7 @@
 				<graburi>$r1:</graburi>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Proxy removes first instance to decline it</description>
 			<request>
 				<method>PUT</method>
@@ -141,9 +141,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$r1:</ruri>
 				<verify>
@@ -155,16 +155,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -176,7 +176,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Organizer cancels second instance</description>
 			<request>
 				<method>PUT</method>
@@ -190,9 +190,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -204,13 +204,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>No item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITCOUNT 0</method>
 				<ruri>$rcalendarpath1:/</ruri>
 			</request>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$r1:</ruri>
 				<verify>
@@ -222,7 +222,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto2.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,8 +29,8 @@
 
 	<start/>
 	
-	<test-suite name='#1 Recurring Master' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Recurring Master'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -44,16 +44,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -65,9 +65,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -87,9 +87,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -101,7 +101,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -114,8 +114,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#2 Modify one instance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 Modify one instance'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -129,16 +129,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -150,9 +150,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -172,9 +172,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -186,7 +186,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -199,8 +199,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#3 Modify two instances' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Modify two instances'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -214,16 +214,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -235,9 +235,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -257,9 +257,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -271,7 +271,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -284,8 +284,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#4 Recurring - one instance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#4 Recurring - one instance'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -299,16 +299,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -320,9 +320,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -342,9 +342,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -356,7 +356,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -369,8 +369,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#5 Recurring - add another instance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#5 Recurring - add another instance'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -384,16 +384,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -405,9 +405,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -427,9 +427,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -441,7 +441,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -454,8 +454,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#6 Recurring - update instance with conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#6 Recurring - update instance with conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -469,16 +469,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -490,9 +490,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -512,9 +512,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -526,7 +526,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -539,8 +539,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#7 Recurring Master - one exdate' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#7 Recurring Master - one exdate'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -554,16 +554,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -575,9 +575,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -597,9 +597,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -611,7 +611,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -624,8 +624,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#8 Recurring Master - another exdate' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#8 Recurring Master - another exdate'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -639,16 +639,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -660,9 +660,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -682,9 +682,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -696,7 +696,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto3.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,8 +29,8 @@
 
 	<start/>
 	
-	<test-suite name='#1 Recurring Master' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Recurring Master'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -44,16 +44,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -65,9 +65,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -87,9 +87,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -101,7 +101,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -118,8 +118,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#2 Cancel one instance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 Cancel one instance'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -137,9 +137,9 @@
 				<ruri>4</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>No items in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -159,9 +159,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -173,9 +173,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -195,9 +195,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -209,7 +209,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -222,8 +222,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#3 Cancel multiple instances' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Cancel multiple instances'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -237,16 +237,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -258,9 +258,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -280,9 +280,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -294,7 +294,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -307,8 +307,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#4 Recurring Master with overridden instances' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#4 Recurring Master with overridden instances'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -322,16 +322,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -343,9 +343,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -365,9 +365,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -379,7 +379,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -392,8 +392,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#5 Uninvite one overridden instance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#5 Uninvite one overridden instance'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -411,9 +411,9 @@
 				<ruri>4</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>No items in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -433,9 +433,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -447,9 +447,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -469,9 +469,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -483,7 +483,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -496,8 +496,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#6 Uninvite/cancel multiple overridden instances' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#6 Uninvite/cancel multiple overridden instances'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -515,9 +515,9 @@
 				<ruri>4</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>No items in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -537,9 +537,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -551,9 +551,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -573,9 +573,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -587,7 +587,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -600,8 +600,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#7 Recurring Master with only invited overridden instances' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#7 Recurring Master with only invited overridden instances'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -615,16 +615,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -636,9 +636,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -658,9 +658,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -672,7 +672,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -685,8 +685,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#8 Cancel one overridden instance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#8 Cancel one overridden instance'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -700,16 +700,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -721,9 +721,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -743,9 +743,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -757,7 +757,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto4.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,8 +29,8 @@
 
 	<start/>
 	
-	<test-suite name='#1 5-day recurrence' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 5-day recurrence'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -44,16 +44,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -65,9 +65,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -87,9 +87,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -101,7 +101,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -114,8 +114,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#2 3rd-day override' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 3rd-day override'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -129,16 +129,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -150,9 +150,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -172,9 +172,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -186,7 +186,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -199,8 +199,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#3 4th-day cancel' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 4th-day cancel'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -214,16 +214,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -235,9 +235,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -257,9 +257,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -271,7 +271,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto5.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,8 +29,8 @@
 
 	<start/>
 	
-	<test-suite name='#1 Block out one day in a week' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Block out one day in a week'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -44,16 +44,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -65,9 +65,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -87,9 +87,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -101,7 +101,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -114,8 +114,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#2 Full recurrence with partial decline' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 Full recurrence with partial decline'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -129,16 +129,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -150,9 +150,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -172,9 +172,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -186,7 +186,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -199,8 +199,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#3 Partial recurrence with decline only' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Partial recurrence with decline only'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -214,16 +214,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -235,9 +235,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -257,9 +257,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -271,7 +271,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -284,8 +284,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#4 Partial recurrence with mixed partstat' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#4 Partial recurrence with mixed partstat'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -299,16 +299,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>
@@ -320,9 +320,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -342,9 +342,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -356,7 +356,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,8 +29,8 @@
 
 	<start/>
 	
-	<test-suite name='#1 Block out unbounded' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Block out unbounded'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -44,16 +44,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -65,9 +65,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -87,9 +87,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -101,7 +101,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -114,8 +114,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#2 Partial overlap - declined master' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 Partial overlap - declined master'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -129,16 +129,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -150,9 +150,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -172,9 +172,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -186,7 +186,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -199,8 +199,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#3 Change block out unbounded' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Change block out unbounded'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -214,16 +214,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -235,9 +235,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -257,9 +257,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -271,7 +271,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -284,8 +284,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#4 Partial overlap - still declined master' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#4 Partial overlap - still declined master'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -299,16 +299,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -320,9 +320,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -342,9 +342,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -356,7 +356,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -369,8 +369,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#5 Delete block out unbounded' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#5 Delete block out unbounded'>
+		<test name='1'>
 			<description>Delete event</description>
 			<request>
 				<method>DELETE</method>
@@ -384,9 +384,9 @@
 				<ruri>4</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>No item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -406,9 +406,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>No item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -420,9 +420,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -442,9 +442,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<header>
@@ -464,7 +464,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -477,8 +477,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#6 Partial overlap - accepted master' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#6 Partial overlap - accepted master'>
+		<test name='1'>
 			<description>Update event</description>
 			<request>
 				<method>PUT</method>
@@ -492,16 +492,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -513,9 +513,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -535,9 +535,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -549,7 +549,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto7.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -40,8 +40,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Non-recurring all-day without conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Non-recurring all-day without conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -55,16 +55,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -76,16 +76,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -97,9 +97,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -119,9 +119,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -133,7 +133,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -150,8 +150,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#2 Non-recurring timed with conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 Non-recurring timed with conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -165,16 +165,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -186,16 +186,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -207,9 +207,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -229,9 +229,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -243,7 +243,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -260,8 +260,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#3 Non-recurring timed partial with conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Non-recurring timed partial with conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -275,16 +275,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -296,16 +296,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -317,9 +317,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -339,9 +339,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -353,7 +353,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -370,8 +370,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#4 Non-recurring timed without conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#4 Non-recurring timed without conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -385,16 +385,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>
@@ -406,16 +406,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -427,9 +427,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -449,9 +449,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -463,7 +463,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -480,8 +480,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#5 Non-recurring all-day partial with conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#5 Non-recurring all-day partial with conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -495,16 +495,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -516,16 +516,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -537,9 +537,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -559,9 +559,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -573,7 +573,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -590,8 +590,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#6 Recurring all-day with partial conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#6 Recurring all-day with partial conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -605,16 +605,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<verify>
@@ -626,16 +626,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -647,9 +647,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -669,9 +669,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -683,7 +683,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto8.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -34,8 +34,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Non-recurring' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Non-recurring'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -49,16 +49,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -70,9 +70,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -84,7 +84,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Create new event that immediately precedes the other</description>
 			<request>
 				<method>PUT</method>
@@ -98,16 +98,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -119,9 +119,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -133,7 +133,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -146,8 +146,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#1 Recurring' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Recurring'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -161,16 +161,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -182,9 +182,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -196,7 +196,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Create new event that immediately precedes the other</description>
 			<request>
 				<method>PUT</method>
@@ -210,16 +210,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>
@@ -231,9 +231,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -245,7 +245,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto9.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,8 +29,8 @@
 
 	<start/>
 	
-	<test-suite name='#1 Decline one valid instance' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Decline one valid instance'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -44,16 +44,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -65,9 +65,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -87,9 +87,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -101,9 +101,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Proxy decline resource01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -115,16 +115,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -136,7 +136,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Update event summary - resource partstat unchanged</description>
 			<request>
 				<method>PUT</method>
@@ -154,9 +154,9 @@
 				<ruri>1</ruri>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>No items in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -176,9 +176,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -190,9 +190,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -212,9 +212,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -226,7 +226,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Re-invite declined instance</description>
 			<request>
 				<method>PUT</method>
@@ -240,16 +240,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -261,9 +261,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
+		<test name='17'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -283,9 +283,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -297,7 +297,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautogroup.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,8 +37,8 @@
 		</request>
 	</start>
 
-	<test-suite name='#1 Group organizer: accepted' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Group organizer: accepted'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -52,16 +52,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -73,16 +73,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user03 Inbox</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -94,7 +94,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource11 Inbox</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -117,7 +117,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource11 Calendar</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -132,7 +132,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -149,8 +149,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#2 Group organizer: declined' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 Group organizer: declined'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -164,16 +164,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -185,16 +185,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user03 Inbox</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -206,7 +206,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource11 Inbox</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -229,7 +229,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource11 Calendar</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -244,7 +244,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -261,8 +261,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#3 Non-group organizer: declined' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Non-group organizer: declined'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
@@ -276,14 +276,14 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user02 Inbox</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user02 Calendar</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -297,16 +297,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user03 Inbox</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -318,7 +318,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource11 Inbox</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -341,7 +341,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource11 Calendar</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -356,7 +356,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -377,8 +377,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#4 Group organizer: accepted at same time as non-group organizer decline' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#4 Group organizer: accepted at same time as non-group organizer decline'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -392,16 +392,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>
@@ -413,16 +413,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user03 Inbox</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -434,7 +434,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource11 Inbox</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -457,7 +457,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource11 Calendar</description>
 			<request user="$useradmin:" pswd="$pswdadmin:"
 				print-response="no">
@@ -472,7 +472,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautomultiple.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -54,8 +54,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Non-recurring without conflict' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Non-recurring without conflict'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -69,16 +69,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Two items in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -90,16 +90,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -111,9 +111,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -133,9 +133,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -151,9 +151,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>No items in resource02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath2:/</ruri>
 				<header>
@@ -173,9 +173,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>One item in resource02 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath2:/</ruri>
 				<verify>
@@ -191,7 +191,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitautopast.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -51,8 +51,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Non-recurring past event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Non-recurring past event'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -70,9 +70,9 @@
 				<ruri>1</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>No item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -92,9 +92,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -106,16 +106,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -127,9 +127,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -149,9 +149,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -163,7 +163,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -180,8 +180,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#2 Recurring all in the past' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#2 Recurring all in the past'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -199,9 +199,9 @@
 				<ruri>1</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>No item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -221,9 +221,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -235,16 +235,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -256,9 +256,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -278,9 +278,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -292,7 +292,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>
@@ -309,8 +309,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='#3 Recurring some in the past' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#3 Recurring some in the past'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -324,16 +324,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request print-response="no">
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -345,16 +345,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -366,9 +366,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<header>
@@ -388,9 +388,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -402,7 +402,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitbadclients.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,10 +37,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Client drops an overridden instance' ignore='no'>
+	<test-suite name='Client drops an overridden instance'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -54,7 +54,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -68,14 +68,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -89,14 +89,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted with drop</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -110,7 +110,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -124,14 +124,14 @@
 		</test>
 		<test name='8'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -161,10 +161,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Client drops a cancelled overridden instance' ignore='no'>
+	<test-suite name='Client drops a cancelled overridden instance'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -178,7 +178,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -192,14 +192,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -213,14 +213,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted with drop</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -234,7 +234,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -248,14 +248,14 @@
 		</test>
 		<test name='8'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -285,10 +285,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='All-day freebusy floating' ignore='no'>
+	<test-suite name='All-day freebusy floating'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitbatchrefresh.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -47,10 +47,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Invite and one reply' ignore='no'>
+	<test-suite name='Invite and one reply'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -64,7 +64,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -78,14 +78,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -99,14 +99,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -120,14 +120,14 @@
 		</test>
 		<test name='6'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='7'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -141,7 +141,7 @@
 		</test>
 		<test name='9'>
 			<description>Other attendees have data</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -152,7 +152,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath4:/</ruri>
 				<verify>
@@ -163,7 +163,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes" print-response='no'>
+			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath5:/</ruri>
 				<verify>
@@ -174,7 +174,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes" print-response='no'>
+			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath6:/</ruri>
 				<verify>
@@ -185,7 +185,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes" print-response='no'>
+			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath7:/</ruri>
 				<verify>
@@ -196,7 +196,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes" print-response='no'>
+			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath8:/</ruri>
 				<verify>
@@ -207,7 +207,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath9:/</ruri>
 				<verify>
@@ -218,7 +218,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -229,7 +229,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes" print-response='no'>
+			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath11:/</ruri>
 				<verify>
@@ -240,7 +240,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes" print-response='no'>
+			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath12:/</ruri>
 				<verify>
@@ -254,10 +254,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Invite and two quick replies' ignore='no'>
+	<test-suite name='Invite and two quick replies'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -271,7 +271,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -285,18 +285,18 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -307,7 +307,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -321,14 +321,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee #2 -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -342,14 +342,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee #3 -> Accepted</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -363,14 +363,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -384,7 +384,7 @@
 		</test>
 		<test name='10'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -395,7 +395,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -406,7 +406,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath4:/</ruri>
 				<verify>
@@ -417,7 +417,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes" print-response='no'>
+			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath5:/</ruri>
 				<verify>
@@ -428,7 +428,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes" print-response='no'>
+			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath6:/</ruri>
 				<verify>
@@ -439,7 +439,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes" print-response='no'>
+			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath7:/</ruri>
 				<verify>
@@ -450,7 +450,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes" print-response='no'>
+			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath8:/</ruri>
 				<verify>
@@ -461,7 +461,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath9:/</ruri>
 				<verify>
@@ -472,7 +472,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -483,7 +483,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes" print-response='no'>
+			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath11:/</ruri>
 				<verify>
@@ -494,7 +494,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes" print-response='no'>
+			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath12:/</ruri>
 				<verify>
@@ -508,10 +508,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Invite and two interleaved replies' ignore='no'>
+	<test-suite name='Invite and two interleaved replies'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<data>
@@ -525,7 +525,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -539,18 +539,18 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -561,7 +561,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -575,14 +575,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee #2 -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -596,14 +596,14 @@
 		</test>
 		<test name='7'>
 			<description>Attendee #3 -> Accepted</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -617,14 +617,14 @@
 		</test>
 		<test name='8'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -638,7 +638,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -649,7 +649,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -660,7 +660,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath4:/</ruri>
 				<verify>
@@ -671,7 +671,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes" print-response='no'>
+			<request user="$userid5:" pswd="$pswd5:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath5:/</ruri>
 				<verify>
@@ -682,7 +682,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes" print-response='no'>
+			<request user="$userid6:" pswd="$pswd6:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath6:/</ruri>
 				<verify>
@@ -693,7 +693,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes" print-response='no'>
+			<request user="$userid7:" pswd="$pswd7:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath7:/</ruri>
 				<verify>
@@ -704,7 +704,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes" print-response='no'>
+			<request user="$userid8:" pswd="$pswd8:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath8:/</ruri>
 				<verify>
@@ -715,7 +715,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes" print-response='no'>
+			<request user="$userid9:" pswd="$pswd9:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath9:/</ruri>
 				<verify>
@@ -726,7 +726,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -737,7 +737,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes" print-response='no'>
+			<request user="$userid11:" pswd="$pswd11:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath11:/</ruri>
 				<verify>
@@ -748,7 +748,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes" print-response='no'>
+			<request user="$userid12:" pswd="$pswd12:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath12:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcalendartransp.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='New Calendar' ignore='no'>
+	<test-suite name='New Calendar'>
 		<test name='1'>
 			<description>Create new calendar</description>
-			<request print-response="no" end-delete="yes">
+			<request end-delete="yes">
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/testcalendar/</ruri>
 				<verify>
@@ -41,7 +41,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for property on new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/testcalendar/</ruri>
 				<header>
@@ -63,7 +63,7 @@
 		</test>
 		<test name='3'>
 			<description>Set property on new calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/testcalendar/</ruri>
 				<data>
@@ -81,7 +81,7 @@
 		</test>
 		<test name='4'>
 			<description>Look for property on new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/testcalendar/</ruri>
 				<header>
@@ -103,10 +103,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Default Calendar' ignore='no'>
+	<test-suite name='Default Calendar'>
 		<test name='1'>
 			<description>Look for property on new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -128,10 +128,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='New Calendar - free-busy-set compatibility' ignore='no'>
+	<test-suite name='New Calendar - free-busy-set compatibility'>
 		<test name='1'>
 			<description>Create new calendar</description>
-			<request print-response="no" end-delete="yes">
+			<request end-delete="yes">
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<verify>
@@ -141,7 +141,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for property on new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<header>
@@ -163,7 +163,7 @@
 		</test>
 		<test name='3'>
 			<description>Look for free-busy-set</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -185,7 +185,7 @@
 		</test>
 		<test name='4'>
 			<description>Set property on new calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<data>
@@ -203,7 +203,7 @@
 		</test>
 		<test name='5'>
 			<description>Look for property on new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<header>
@@ -225,7 +225,7 @@
 		</test>
 		<test name='6'>
 			<description>Look for free-busy-set</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -247,7 +247,7 @@
 		</test>
 		<test name='7'>
 			<description>Set property on new calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<data>
@@ -265,7 +265,7 @@
 		</test>
 		<test name='8'>
 			<description>Look for property on new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<header>
@@ -287,7 +287,7 @@
 		</test>
 		<test name='9'>
 			<description>Look for free-busy-set</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -309,7 +309,7 @@
 		</test>
 		<test name='10'>
 			<description>Set property on new calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<data>
@@ -327,7 +327,7 @@
 		</test>
 		<test name='11'>
 			<description>Look for property on new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<header>
@@ -349,7 +349,7 @@
 		</test>
 		<test name='12'>
 			<description>Move new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/testcalendar2/</ruri>
 				<header>
@@ -363,7 +363,7 @@
 		</test>
 		<test name='13'>
 			<description>Look for free-busy-set</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -389,7 +389,7 @@
 		</test>
 		<test name='14'>
 			<description>Delete new calendar</description>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/testcalendar3/</ruri>
 				<verify>
@@ -403,7 +403,7 @@
 		</test>
 		<test name='15'>
 			<description>Look for free-busy-set</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -426,7 +426,7 @@
 		</test>
 		<test name='16'>
 			<description>Look for free-busy-set fro default calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcompatibility.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -44,7 +44,7 @@
 	<test-suite name='Organizer Merge - insignificant change' ignore='yes'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -58,7 +58,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -76,14 +76,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -97,14 +97,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -118,14 +118,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -139,7 +139,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer adds VALARM to one instance</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -157,7 +157,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -171,7 +171,7 @@
 		</test>
 		<test name='12'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -210,10 +210,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Attendee instance override as master' ignore='no'>
+	<test-suite name='Attendee instance override as master'>
 		<test name='1'>
 			<description>Organizer invites Attendee to on overridden instance only</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -227,7 +227,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -245,14 +245,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -266,14 +266,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted removing R-ID</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -287,7 +287,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$</ruri>
 				<verify>
@@ -301,14 +301,14 @@
 		</test>
 		<test name='8'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -338,10 +338,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Attendee two instance override as master' ignore='no'>
+	<test-suite name='Attendee two instance override as master'>
 		<test name='1'>
 			<description>Organizer invites Attendee to on overridden instance only</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -355,7 +355,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -373,14 +373,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -394,14 +394,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted removing R-ID</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -415,7 +415,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$</ruri>
 				<verify>
@@ -429,14 +429,14 @@
 		</test>
 		<test name='8'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitcopymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitcopymove.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitcopymove.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -54,10 +54,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='PUT UID restrictions - ORGANIZER' ignore='no'>
+	<test-suite name='PUT UID restrictions - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -71,7 +71,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -85,14 +85,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -106,7 +106,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer tries PUT of same resource to another calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/calendar-2/2.ics</ruri>
 				<data>
@@ -124,7 +124,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer tries PUT of same resource to a collection</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/2.ics</ruri>
 				<data>
@@ -138,7 +138,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer tries PUT of same resource without Organizer/Attendee to another calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/calendar-2/3.ics</ruri>
 				<data>
@@ -156,7 +156,7 @@
 		</test>
 		<test name='9'>
 			<description>Organizer tries PUT of same resource without Organizer/Attendee to a collection</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/3.ics</ruri>
 				<data>
@@ -170,7 +170,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer overwrites resource without Organizer/Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -184,7 +184,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -198,14 +198,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has no data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -262,10 +262,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='PUT no UID restrictions - ORGANIZER' ignore='no'>
+	<test-suite name='PUT no UID restrictions - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer stores without Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -279,7 +279,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -293,7 +293,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer stores without Attendeeinto another calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/calendar-2/1.ics</ruri>
 				<data>
@@ -307,7 +307,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/calendar-2/1.ics</ruri>
 				<verify>
@@ -356,10 +356,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='PUT UID restrictions - ATTENDEE' ignore='no'>
+	<test-suite name='PUT UID restrictions - ATTENDEE'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -373,7 +373,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -387,13 +387,13 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -407,7 +407,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee tries PUT of same resource to another calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome2:/calendar-2/2.ics</ruri>
 				<data>
@@ -425,7 +425,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee tries PUT of same resource to a collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome2:/collection/2.ics</ruri>
 				<data>
@@ -439,7 +439,7 @@
 		</test>
 		<test name='8'>
 			<description>Attendee tries PUT of same resource without Organizer/Attendee to another calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome2:/calendar-2/3.ics</ruri>
 				<data>
@@ -457,7 +457,7 @@
 		</test>
 		<test name='9'>
 			<description>Attendee tries PUT of same resource without Organizer/Attendee to a collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome2:/collection/3.ics</ruri>
 				<data>
@@ -471,14 +471,14 @@
 		</test>
 		<test name='10'>
 			<description>Attendee overwrites resource without Organizer/Attendee</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -496,7 +496,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer no Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -553,10 +553,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='PUT non-schedule->schedule' ignore='no'>
+	<test-suite name='PUT non-schedule->schedule'>
 		<test name='1'>
 			<description>Organizer does not invite Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -570,7 +570,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -584,7 +584,7 @@
 		</test>
 		<test name='3'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -606,7 +606,7 @@
 		</test>
 		<test name='4'>
 			<description>Attendee no data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -628,7 +628,7 @@
 		</test>
 		<test name='5'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -642,7 +642,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -656,14 +656,14 @@
 		</test>
 		<test name='7'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -712,10 +712,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='MOVE to other calendar - ORGANIZER' ignore='no'>
+	<test-suite name='MOVE to other calendar - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -729,7 +729,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -743,14 +743,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -764,7 +764,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer MOVES to another calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -778,7 +778,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -835,10 +835,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='MOVE to other calendar - ATTENDEE' ignore='no'>
+	<test-suite name='MOVE to other calendar - ATTENDEE'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -852,7 +852,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -866,14 +866,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -887,14 +887,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee MOVES to another calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>MOVE</method>
 				<ruri>$</ruri>
 				<header>
@@ -908,7 +908,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer no Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -965,10 +965,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='MOVE from/to collection - ORGANIZER' ignore='no'>
+	<test-suite name='MOVE from/to collection - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer stores to collection</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<data>
@@ -982,7 +982,7 @@
 		</test>
 		<test name='2'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1004,7 +1004,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer MOVES to calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<header>
@@ -1018,7 +1018,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -1032,14 +1032,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1053,7 +1053,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer MOVES to collection</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1067,14 +1067,14 @@
 		</test>
 		<test name='9'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='10'>
 			<description>Attendee has no data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -1131,10 +1131,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='MOVE to calendar with overwrite - ORGANIZER' ignore='no'>
+	<test-suite name='MOVE to calendar with overwrite - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer stores to collection</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<data>
@@ -1148,7 +1148,7 @@
 		</test>
 		<test name='2'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1170,7 +1170,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer stores to calendar - no Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1184,7 +1184,7 @@
 		</test>
 		<test name='4'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1206,7 +1206,7 @@
 		</test>
 		<test name='5'>
 			<description>Organizer MOVES to calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<header>
@@ -1220,7 +1220,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1234,14 +1234,14 @@
 		</test>
 		<test name='7'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1255,7 +1255,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer stores to collection without Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<data>
@@ -1269,7 +1269,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1291,7 +1291,7 @@
 		</test>
 		<test name='12'>
 			<description>Organizer MOVES to calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<header>
@@ -1305,7 +1305,7 @@
 		</test>
 		<test name='13'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1319,14 +1319,14 @@
 		</test>
 		<test name='14'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='15'>
 			<description>Attendee has no data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -1383,10 +1383,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='COPY between calendars/collections no scheduling - ORGANIZER' ignore='no'>
+	<test-suite name='COPY between calendars/collections no scheduling - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer stores without Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1400,7 +1400,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1414,7 +1414,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer COPIES to a collection</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -1428,7 +1428,7 @@
 		</test>
 		<test name='4'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1450,7 +1450,7 @@
 		</test>
 		<test name='5'>
 			<description>Organizer COPIES to a calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -1464,7 +1464,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1486,7 +1486,7 @@
 		</test>
 		<test name='5'>
 			<description>Organizer tries to invite Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1504,7 +1504,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1561,10 +1561,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='COPY between calendars/collections with scheduling - ORGANIZER/ATTENDEE' ignore='no'>
+	<test-suite name='COPY between calendars/collections with scheduling - ORGANIZER/ATTENDEE'>
 		<test name='1'>
 			<description>Organizer stores without Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1578,7 +1578,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1592,14 +1592,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Organizer COPIES to a collection</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -1613,14 +1613,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Organizer COPIES to a calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -1638,14 +1638,14 @@
 		</test>
 		<test name='7'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1659,7 +1659,7 @@
 		</test>
 		<test name='9'>
 			<description>Attendee COPIES to a collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>COPY</method>
 				<ruri>$</ruri>
 				<header>
@@ -1673,7 +1673,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer no Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -1695,7 +1695,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee COPIES to a calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>COPY</method>
 				<ruri>$</ruri>
 				<header>
@@ -1713,7 +1713,7 @@
 		</test>
 		<test name='12'>
 			<description>Organizer no Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -1770,10 +1770,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='COPY from/to collection - ORGANIZER' ignore='no'>
+	<test-suite name='COPY from/to collection - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer stores to collection</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<data>
@@ -1787,7 +1787,7 @@
 		</test>
 		<test name='2'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1809,7 +1809,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer COPIES to calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<header>
@@ -1823,7 +1823,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -1837,14 +1837,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1858,7 +1858,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer COPIES to collection</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1872,7 +1872,7 @@
 		</test>
 		<test name='9'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1929,10 +1929,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='COPY to calendar with overwrite - ORGANIZER' ignore='no'>
+	<test-suite name='COPY to calendar with overwrite - ORGANIZER'>
 		<test name='1'>
 			<description>Organizer stores to collection</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<data>
@@ -1946,7 +1946,7 @@
 		</test>
 		<test name='2'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -1968,7 +1968,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer stores to calendar - no Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1982,7 +1982,7 @@
 		</test>
 		<test name='4'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -2004,7 +2004,7 @@
 		</test>
 		<test name='5'>
 			<description>Organizer COPIES to calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<header>
@@ -2018,7 +2018,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -2032,14 +2032,14 @@
 		</test>
 		<test name='7'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2053,7 +2053,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer stores to collection without Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<data>
@@ -2067,7 +2067,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -2089,7 +2089,7 @@
 		</test>
 		<test name='12'>
 			<description>Organizer COPIES to calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/collection/1.ics</ruri>
 				<header>
@@ -2103,7 +2103,7 @@
 		</test>
 		<test name='13'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -2117,14 +2117,14 @@
 		</test>
 		<test name='14'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='15'>
 			<description>Attendee has no data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitdefaultcalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitdefaultcalendar.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitdefaultcalendar.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -33,10 +33,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Default Property' ignore='no'>
+	<test-suite name='Default Property'>
 		<test name='1'>
 			<description>Look for property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -58,10 +58,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Set empty Property' ignore='no'>
+	<test-suite name='Set empty Property'>
 		<test name='1'>
 			<description>Set property on Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -79,7 +79,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -101,10 +101,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Set valid Property' ignore='no'>
+	<test-suite name='Set valid Property'>
 		<test name='1'>
 			<description>Look for existing property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -126,7 +126,7 @@
 		</test>
 		<test name='2'>
 			<description>Set property on Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -144,7 +144,7 @@
 		</test>
 		<test name='3'>
 			<description>Verify property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -166,10 +166,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Set invalid Property' ignore='no'>
+	<test-suite name='Set invalid Property'>
 		<test name='1'>
 			<description>Set property on Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -187,7 +187,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -209,10 +209,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Move default calendar' ignore='no'>
+	<test-suite name='Move default calendar'>
 		<test name='1'>
 			<description>Move calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/calendar-test/</ruri>
 				<header>
@@ -226,7 +226,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -248,10 +248,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Delete previously default calendar' ignore='no'>
+	<test-suite name='Delete previously default calendar'>
 		<test name='1'>
 			<description>Set property on Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -269,7 +269,7 @@
 		</test>
 		<test name='2'>
 			<description>Delete calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/calendar-moved/</ruri>
 				<verify>
@@ -279,7 +279,7 @@
 		</test>
 		<test name='3'>
 			<description>Verify property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -301,10 +301,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Delete default calendar' ignore='no'>
+	<test-suite name='Delete default calendar'>
 		<test name='1'>
 			<description>Delete calendar</description>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:">
 				<method>DELETE</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -314,7 +314,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify property on inbox</description>
-			<request user="$userid10:" pswd="$pswd10:" print-response="no">
+			<request user="$userid10:" pswd="$pswd10:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath10:/</ruri>
 				<header>
@@ -336,10 +336,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Auto-create default calendar on scheduling' ignore='no'>
+	<test-suite name='Auto-create default calendar on scheduling'>
 		<test name='1'>
 			<description>Attendee has no calendar</description>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome10:/</ruri>
 				<header>
@@ -364,7 +364,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -378,7 +378,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -392,14 +392,14 @@
 		</test>
 		<test name='4'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath10:/</ruri>
 			</request>
 		</test>
 		<test name='5'>
 			<description>Attendee has calendar</description>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome10:/</ruri>
 				<header>
@@ -424,7 +424,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid10:" pswd="$pswd10:" print-response='no'>
+			<request user="$userid10:" pswd="$pswd10:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -457,7 +457,7 @@
 	<test-suite name='Set valid Property' ignore='yes'>
 		<test name='1'>
 			<description>Look for existing property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -486,7 +486,7 @@
 		</test>
 		<test name='2'>
 			<description>Set property on Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -504,7 +504,7 @@
 		</test>
 		<test name='3'>
 			<description>Verify property on inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -526,7 +526,7 @@
 		</test>
 		<test name='4'>
 			<description>Set property on Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -544,7 +544,7 @@
 		</test>
 		<test name='5'>
 			<description>Delete calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/calendar-test/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitdeletecalendar.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -41,14 +41,14 @@
 		</request>
 	</start>
 	
-	<test-suite name='Empty Collection Delete' ignore='no'>
+	<test-suite name='Empty Collection Delete'>
 		<require-feature>
 			<feature>regular-collection</feature>
 		</require-feature>
 
 		<test name='1'>
 			<description>Organizer creates collection</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCOL</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
@@ -58,7 +58,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer deletes collection</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<header>
@@ -72,7 +72,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer collection is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
@@ -86,14 +86,14 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Simple Collection Delete' ignore='no'>
+	<test-suite name='Simple Collection Delete'>
 		<require-feature>
 			<feature>regular-collection</feature>
 		</require-feature>
 
 		<test name='1'>
 			<description>Organizer creates collection</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCOL</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
@@ -103,7 +103,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer writes some data</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/1.txt</ruri>
 				<data>
@@ -117,7 +117,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer deletes collection</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<header>
@@ -131,7 +131,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer collection is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
@@ -145,10 +145,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Empty Calendar Delete' ignore='no'>
+	<test-suite name='Empty Calendar Delete'>
 		<test name='1'>
 			<description>Organizer creates calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<verify>
@@ -158,7 +158,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer deletes calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<header>
@@ -172,7 +172,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer calendar is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<verify>
@@ -186,10 +186,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Simple Calendar Delete' ignore='no'>
+	<test-suite name='Simple Calendar Delete'>
 		<test name='1'>
 			<description>Organizer creates calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<verify>
@@ -199,7 +199,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer writes some data</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/calendar2/1.ics</ruri>
 				<data>
@@ -213,7 +213,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer deletes calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<header>
@@ -227,7 +227,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer calendar is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<verify>
@@ -241,10 +241,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Invite Calendar Delete' ignore='no'>
+	<test-suite name='Invite Calendar Delete'>
 		<test name='1'>
 			<description>Organizer creates calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<verify>
@@ -254,7 +254,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer writes some data - no attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/calendar2/1.ics</ruri>
 				<data>
@@ -268,7 +268,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer writes some data - one attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/calendar2/2.ics</ruri>
 				<data>
@@ -282,14 +282,14 @@
 		</test>
 		<test name='4'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='5'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -303,7 +303,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer deletes calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<header>
@@ -317,7 +317,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer calendar is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/calendar2/</ruri>
 				<verify>
@@ -331,14 +331,14 @@
 		</test>
 		<test name='9'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='10'>
 			<description>Attendee has cancelled data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -352,7 +352,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee deletes data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 				<verify>
@@ -362,14 +362,14 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Invite Nested Calendar Delete' ignore='no'>
+	<test-suite name='Invite Nested Calendar Delete'>
 		<require-feature>
 			<feature>regular-collection</feature>
 		</require-feature>
 
 		<test name='1'>
 			<description>Organizer creates collection</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCOL</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
@@ -379,7 +379,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer creates calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/collection/calendar2/</ruri>
 				<verify>
@@ -389,7 +389,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer writes some data - no attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/calendar2/1.ics</ruri>
 				<data>
@@ -403,7 +403,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer writes some data - one attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/calendar2/2.ics</ruri>
 				<data>
@@ -417,14 +417,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -438,7 +438,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer deletes calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<header>
@@ -452,7 +452,7 @@
 		</test>
 		<test name='9'>
 			<description>Organizer collection is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
@@ -466,14 +466,14 @@
 		</test>
 		<test name='10'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='11'>
 			<description>Attendee has cancelled data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -487,7 +487,7 @@
 		</test>
 		<test name='12'>
 			<description>Attendee deletes data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 				<verify>
@@ -497,21 +497,21 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Multiple Nested Calendars Delete' ignore='no'>
+	<test-suite name='Multiple Nested Calendars Delete'>
 		<require-feature>
 			<feature>regular-collection</feature>
 		</require-feature>
 
 		<test name='1'>
 			<description>Organizer creates collections</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCOL</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>MKCOL</method>
 				<ruri>$calendarhome1:/collection/collection2</ruri>
 				<verify>
@@ -521,14 +521,14 @@
 		</test>
 		<test name='2'>
 			<description>Organizer creates calendars</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/collection/calendar2/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/collection/collection2/calendar3/</ruri>
 				<verify>
@@ -538,7 +538,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer writes some data - no attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/calendar2/1.ics</ruri>
 				<data>
@@ -552,7 +552,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer writes some data - one attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/calendar2/2.ics</ruri>
 				<data>
@@ -566,14 +566,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -587,7 +587,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer writes some more data - no attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/collection2/calendar3/1.ics</ruri>
 				<data>
@@ -601,7 +601,7 @@
 		</test>
 		<test name='9'>
 			<description>Organizer writes some more data - a different attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/collection/collection2/calendar3/2.ics</ruri>
 				<data>
@@ -615,14 +615,14 @@
 		</test>
 		<test name='10'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='11'>
 			<description>Attendee has data</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -636,7 +636,7 @@
 		</test>
 		<test name='13'>
 			<description>Organizer deletes calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<header>
@@ -650,7 +650,7 @@
 		</test>
 		<test name='14'>
 			<description>Organizer collection is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/collection/</ruri>
 				<verify>
@@ -664,18 +664,18 @@
 		</test>
 		<test name='15'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='16'>
 			<description>Attendee has cancelled data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -689,7 +689,7 @@
 		</test>
 		<test name='17'>
 			<description>Attendee deletes data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 				<verify>
@@ -699,7 +699,7 @@
 		</test>
 		<test name='18'>
 			<description>Attendee has cancelled data</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -713,7 +713,7 @@
 		</test>
 		<test name='19'>
 			<description>Attendee deletes data</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitdropbox.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -38,10 +38,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Simple dropbox' ignore='no'>
+	<test-suite name='Simple dropbox'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -55,7 +55,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -69,14 +69,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -90,14 +90,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted without ATTACH</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -111,7 +111,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -125,14 +125,14 @@
 		</test>
 		<test name='8'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -146,14 +146,14 @@
 		</test>
 		<test name='11'>
 			<description>Attendee -> Accepted adds new ATTACH</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -167,7 +167,7 @@
 		</test>
 		<test name='12'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -181,7 +181,7 @@
 		</test>
 		<test name='13'>
 			<description>Organizer no Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -203,7 +203,7 @@
 		</test>
 		<test name='14'>
 			<description>Organizer data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -217,7 +217,7 @@
 		</test>
 		<test name='15'>
 			<description>Organizer adds another ATTACH</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -231,7 +231,7 @@
 		</test>
 		<test name='16'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -245,14 +245,14 @@
 		</test>
 		<test name='17'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='18'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -282,10 +282,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Dropbox - no attachment' ignore='no'>
+	<test-suite name='Dropbox - no attachment'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -299,7 +299,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -313,14 +313,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -334,14 +334,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -355,14 +355,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -376,7 +376,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer changes X-APPLE-DROPBOX only</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -390,7 +390,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -404,14 +404,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/impliciterrors.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,7 +31,7 @@
 	<test-suite name='Allowed Organizers'>
 		<test name='1'>
 			<description>Organizer (resource) invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$rcalendarpath1:/1.ics</ruri>
 				<data>
@@ -52,7 +52,7 @@
 	<test-suite name='Canonical paths'>
 		<test name='1'>
 			<description>Organizer creates event without Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -66,7 +66,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer updates with Attendee - different path</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpathalt1:/2.ics</ruri>
 				<data>
@@ -103,7 +103,7 @@
 	<test-suite name='Two EXDATEs'>
 		<test name='1'>
 			<description>Organizer creates recurring event with Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<data>
@@ -121,14 +121,14 @@
 		</test>
 		<test name='2'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3'>
 			<description>Organizer deletes two recurring instances</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<header>
@@ -150,14 +150,14 @@
 		</test>
 		<test name='4'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='5'>
 			<description>Organizer switches EXDATE order</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<header>
@@ -179,7 +179,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee No Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -201,7 +201,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer deletes one more recurring instance</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<header>
@@ -223,7 +223,7 @@
 		</test>
 		<test name='8'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
@@ -249,7 +249,7 @@
 	<test-suite name='Bad content-type on Inbox'>
 		<test name='1'>
 			<description>Organizer creates event with Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -263,18 +263,18 @@
 		</test>
 		<test name='2'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -293,14 +293,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Organizer deletes event</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -322,14 +322,14 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -371,7 +371,7 @@
 	<test-suite name='Invalid Attendee PUT using Organizer on server'>
 		<test name='1'>
 			<description>Attendee creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/123.ics</ruri>
 				<data>
@@ -389,7 +389,7 @@
 		</test>
 		<test name='2'>
 			<description>No Attendee resource</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/123.ics</ruri>
 				<verify>
@@ -406,7 +406,7 @@
 	<test-suite name='Recurrence expand with expand EXDATE'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -420,7 +420,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -434,14 +434,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -455,7 +455,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer expands recurrence</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -469,7 +469,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -483,14 +483,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -523,7 +523,7 @@
 	<test-suite name='Invalid Organizer PUT of orphaned instance'>
 		<test name='1'>
 			<description>Organizer creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/123.ics</ruri>
 				<data>
@@ -541,7 +541,7 @@
 		</test>
 		<test name='2'>
 			<description>No Organizer resource</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/123.ics</ruri>
 				<verify>
@@ -558,7 +558,7 @@
 	<test-suite name='Invalid Attendee PUT of missing cancelled instance'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -572,7 +572,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -586,14 +586,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -607,7 +607,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer cancels instance</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -621,7 +621,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -635,14 +635,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -656,14 +656,14 @@
 		</test>
 		<test name='11'>
 			<description>Attendee -> Tries to overwrite with other cancelled instance</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -674,7 +674,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$</ruri>
 				<verify>
@@ -704,7 +704,7 @@
 	<test-suite name='Invalid Attendee PUT without own ATTENDEE property'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -718,7 +718,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -732,14 +732,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -753,14 +753,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee -> tried to remove own ATTENDEE property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -797,7 +797,7 @@
 	<test-suite name='Attempt to remove Organizer'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -811,7 +811,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -825,14 +825,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -846,7 +846,7 @@
 		</test>
 		<test name='5'>
 			<description>Organizer tries to remove own ORGANIZER property</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -864,7 +864,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer removes ORGANIZER and ATTENDEE properties</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -878,7 +878,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -892,14 +892,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Attendee has cancelled data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -929,7 +929,7 @@
 	<test-suite name='Organizer PUT remove recurrence and master override'>
 		<test name='1'>
 			<description>Organizer invites Attendee - recurring with master override</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -947,7 +947,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -961,7 +961,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer removes recurrence and override</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -979,7 +979,7 @@
 		</test>
 		<test name='4'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -993,7 +993,7 @@
 		</test>
 		<test name='5'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitimip.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,10 +37,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Attempt to store externally organized event' ignore='no'>
+	<test-suite name='Attempt to store externally organized event'>
 		<test name='1'>
 			<description>Attendee stores organized event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -54,7 +54,7 @@
 		</test>
 		<test name='2'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -68,7 +68,7 @@
 		</test>
 		<test name='3'>
 			<description>Attendee stores organized event with SCHEDULE-AGENT=NONE</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -82,7 +82,7 @@
 		</test>
 		<test name='4'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -96,7 +96,7 @@
 		</test>
 		<test name='5'>
 			<description>Attendee stores organized event with SCHEDULE-AGENT=CLIENT</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -110,7 +110,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -143,10 +143,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Attempt to store local organized event with SCHEDULE-AGENT=SERVER' ignore='no'>
+	<test-suite name='Attempt to store local organized event with SCHEDULE-AGENT=SERVER'>
 		<test name='1'>
 			<description>Attendee stores organized event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarpath2:/1.ics</ruri>
 				<data>
@@ -164,7 +164,7 @@
 		</test>
 		<test name='2'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -197,10 +197,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Store externally organized event without matching attendee' ignore='no'>
+	<test-suite name='Store externally organized event without matching attendee'>
 		<test name='1'>
 			<description>Attendee stores organized event (no local attendees)</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -214,7 +214,7 @@
 		</test>
 		<test name='2'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -228,7 +228,7 @@
 		</test>
 		<test name='3'>
 			<description>Attendee stores organized event (one local attendee)</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -242,7 +242,7 @@
 		</test>
 		<test name='4'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -256,7 +256,7 @@
 		</test>
 		<test name='5'>
 			<description>Attendee updates organized event (one local attendee)</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -270,7 +270,7 @@
 		</test>
 		<test name='6'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -284,7 +284,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee deletes organized event (one local attendee)</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -294,7 +294,7 @@
 		</test>
 		<test name='8'>
 			<description>Attendee stores organized event with SCHEDULE-AGENT=CLIENT</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<data>
@@ -308,7 +308,7 @@
 		</test>
 		<test name='9'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -322,7 +322,7 @@
 		</test>
 		<test name='10'>
 			<description>Attendee stores organized event with SCHEDULE-AGENT=CLIENT</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<data>
@@ -336,7 +336,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitlarge.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -45,8 +45,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 Large invite' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 Large invite'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request>
 				<method>PUT</method>
@@ -60,9 +60,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Calendar</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -74,16 +74,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -95,16 +95,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user10 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath10:/</ruri>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One item in user10 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath10:/</ruri>
 				<verify>
@@ -116,16 +116,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in user20 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath20:/</ruri>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>One item in user20 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath20:/</ruri>
 				<verify>
@@ -137,16 +137,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>One item in user30 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath30:/</ruri>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>One item in user30 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath30:/</ruri>
 				<verify>
@@ -158,16 +158,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>One item in user40 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath40:/</ruri>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>One item in user40 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath40:/</ruri>
 				<verify>
@@ -179,7 +179,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Clean-up inboxes</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitoptions.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -47,7 +47,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for options header tag on calendar</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstatchange.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -41,7 +41,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Simple Changes' ignore='no'>
+	<test-suite name='Simple Changes'>
 		<test name='1'>
 			<description>Organizer invites Attendee with PARTSTAT=ACCEPTED</description>
 			<request>
@@ -305,7 +305,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurrence' ignore='no'>
+	<test-suite name='Recurrence'>
 		<test name='1'>
 			<description>Organizer invites Attendee with PARTSTAT=ACCEPTED recurring</description>
 			<request>
@@ -476,7 +476,7 @@
 		</test>
 		<test name='14'>
 			<description>Attendee One Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='yes'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
@@ -525,7 +525,7 @@
 		</test>
 		<test name='18'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='yes'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitpartstattimestamp.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -38,10 +38,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -55,7 +55,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for options header tag on calendar</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -69,10 +69,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Simple Changes' ignore='no'>
+	<test-suite name='Simple Changes'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -86,7 +86,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -100,14 +100,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -121,14 +121,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -142,7 +142,7 @@
 		</test>
 		<test name='7'>
 			<description>Attendee has data with timestamp</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -164,11 +164,11 @@
 		</test>
 		<test name='8'>
 			<description>Organizer Inbox Item has no timestamp</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
@@ -179,14 +179,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>DELETEALL</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='10'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -200,7 +200,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer changes Summary</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -214,7 +214,7 @@
 		</test>
 		<test name='12'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -228,14 +228,14 @@
 		</test>
 		<test name='13'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='14'>
 			<description>Attendee has data timestamp unchanged</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -264,14 +264,14 @@
 		</test>
 		<test name='16'>
 			<description>Attendee -> Declined</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -285,7 +285,7 @@
 		</test>
 		<test name='17'>
 			<description>Attendee has data timestamp changed</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitprivateevents.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,10 +37,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Simple Event' ignore='no'>
+	<test-suite name='Simple Event'>
 		<test name='1'>
 			<description>Organizer invites Attendee with private event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -54,7 +54,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -68,14 +68,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -89,14 +89,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted with private event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -110,11 +110,11 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
@@ -125,14 +125,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>DELETEALL</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -146,7 +146,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer changes private status</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -160,7 +160,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -174,7 +174,7 @@
 		</test>
 		<test name='12'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitproxy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -40,7 +40,7 @@
 			<method>GET</method>
 			<ruri>$calendarpath3:/</ruri>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response="no">
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>PROPPATCH</method>
 			<ruri>$principal2:calendar-proxy-write/</ruri>
 			<data>
@@ -48,7 +48,7 @@
 				<filepath>Resource/CalDAV/implicit/proxy/1.xml</filepath>
 			</data>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response="no">
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>PROPPATCH</method>
 			<ruri>$principal3:calendar-proxy-write/</ruri>
 			<data>
@@ -58,8 +58,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='Proxy as Organizer' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Proxy as Organizer'>
+		<test name='1'>
 			<description>Proxy creates new event</description>
 			<request>
 				<method>PUT</method>
@@ -73,9 +73,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>No items in user02 Inbox</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -95,9 +95,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user02 Calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath2:/1.ics</ruri>
 				<verify>
@@ -109,16 +109,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user03 Inbox</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -132,17 +132,17 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Proxy as Attendee' ignore='no'>
-		<test name='2' ignore='no'>
+	<test-suite name='Proxy as Attendee'>
+		<test name='2'>
 			<description>Proxy updates event</description>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -154,16 +154,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user02 Inbox</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath2:/1.ics</ruri>
 				<verify>
@@ -175,9 +175,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No item in user03 Inbox</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath3:/</ruri>
 				<header>
@@ -197,9 +197,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One item in user03 calendar</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -215,7 +215,7 @@
 	
 	<test-suite name="Undo proxy, set ACL">
 		<test name="Undo proxy setting">
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$principal2:calendar-proxy-write/</ruri>
 				<data>
@@ -226,7 +226,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPPATCH</method>
 				<ruri>$principal3:calendar-proxy-write/</ruri>
 				<data>
@@ -239,7 +239,7 @@
 			</request>
 		</test>
 		<test name="Set ACLs" ignore="yes">
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>ACL</method>
 				<ruri>$calendarpath2:/</ruri>
 				<data>
@@ -250,7 +250,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>ACL</method>
 				<ruri>$calendarpath3:/</ruri>
 				<data>
@@ -265,9 +265,9 @@
 	</test-suite>
 
 	<test-suite name='Writer as organizer - no scheduling' ignore='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Writer can read existing event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath2:/1.ics</ruri>
 				<verify>
@@ -279,7 +279,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Writer creates non schedule new event</description>
 			<request>
 				<method>PUT</method>
@@ -293,9 +293,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Writer tries to create new event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath2:/3.ics</ruri>
 				<data>
@@ -322,9 +322,9 @@
 	</test-suite>
 
 	<test-suite name='Writer as attendee - no scheduling' ignore='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Writer can read existing item</description>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -336,7 +336,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Writer creates non schedule new event</description>
 			<request>
 				<method>PUT</method>
@@ -350,9 +350,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Writer updates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -393,7 +393,7 @@
 			<ruri>$calendarpath3:/</ruri>
 		</request>
 
-		<request user="$userid2:" pswd="$pswd2:" print-response="no">
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>PROPPATCH</method>
 			<ruri>$principal2:calendar-proxy-write/</ruri>
 			<data>
@@ -401,7 +401,7 @@
 				<filepath>Resource/CalDAV/implicit/proxy/2.xml</filepath>
 			</data>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response="no">
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>PROPPATCH</method>
 			<ruri>$principal3:calendar-proxy-write/</ruri>
 			<data>
@@ -409,7 +409,7 @@
 				<filepath>Resource/CalDAV/implicit/proxy/2.xml</filepath>
 			</data>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response="no">
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>ACL</method>
 			<ruri>$calendarpath2:/</ruri>
 			<data>
@@ -417,7 +417,7 @@
 				<filepath>Resource/CalDAV/implicit/proxy/11.xml</filepath>
 			</data>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response="no">
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>ACL</method>
 			<ruri>$calendarpath3:/</ruri>
 			<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitpublicproperties.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,7 +37,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Simple Event' ignore='no'>
+	<test-suite name='Simple Event'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur1.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -41,10 +41,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Override only in Request' ignore='no'>
+	<test-suite name='Override only in Request'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -58,7 +58,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -72,14 +72,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -93,7 +93,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer overrides an instance</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -107,7 +107,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -121,11 +121,11 @@
 		</test>
 		<test name='8'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
@@ -136,14 +136,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -157,7 +157,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer updates an overridden instance</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -171,7 +171,7 @@
 		</test>
 		<test name='12'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -185,11 +185,11 @@
 		</test>
 		<test name='13'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
@@ -200,14 +200,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='14'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -221,7 +221,7 @@
 		</test>
 		<test name='16'>
 			<description>Organizer updates master instance</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -235,7 +235,7 @@
 		</test>
 		<test name='17'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -249,11 +249,11 @@
 		</test>
 		<test name='18'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
@@ -264,14 +264,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='19'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -301,10 +301,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Cancel Override' ignore='no'>
+	<test-suite name='Cancel Override'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -318,7 +318,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -332,18 +332,18 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -354,7 +354,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -368,7 +368,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer deletes data</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -382,11 +382,11 @@
 		</test>
 		<test name='7'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
@@ -401,11 +401,11 @@
 				<method>DELETEALL</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath3:/</ruri>
 				<verify>
@@ -423,7 +423,7 @@
 		</test>
 		<test name='8'>
 			<description>Attendees have cancelled data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -434,7 +434,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -464,10 +464,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='RRULE Changes' ignore='no'>
+	<test-suite name='RRULE Changes'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -481,7 +481,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -495,14 +495,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -516,14 +516,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted with rrule re-order</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -537,14 +537,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -574,10 +574,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='All-day override' ignore='no'>
+	<test-suite name='All-day override'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -591,7 +591,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -605,14 +605,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -626,7 +626,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer updates an overridden instance</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -640,7 +640,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -654,14 +654,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -691,10 +691,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Attendee Instance Delete' ignore='no'>
+	<test-suite name='Attendee Instance Delete'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -708,7 +708,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -722,14 +722,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -743,14 +743,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -764,14 +764,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -785,14 +785,14 @@
 		</test>
 		<test name='10'>
 			<description>Attendee deletes one instance via EXDATE</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -806,14 +806,14 @@
 		</test>
 		<test name='11'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='12'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -843,10 +843,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='RRULE Truncation' ignore='no'>
+	<test-suite name='RRULE Truncation'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -860,7 +860,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -874,14 +874,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -895,14 +895,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted with two overrides</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -916,14 +916,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -941,7 +941,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer truncates RRULE between overridden instances</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -959,7 +959,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -973,14 +973,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1010,10 +1010,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='RRULE with DTSTART change' ignore='no'>
+	<test-suite name='RRULE with DTSTART change'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1027,7 +1027,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1041,14 +1041,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1062,14 +1062,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -1083,14 +1083,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1108,7 +1108,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer changes DTSTART</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -1126,7 +1126,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1140,14 +1140,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1180,7 +1180,7 @@
 	<test-suite name='RRULE Addition/Removal'>
 		<test name='1'>
 			<description>Organizer invites Attendee without RRULE</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1194,7 +1194,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1208,14 +1208,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1229,14 +1229,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -1250,14 +1250,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1271,7 +1271,7 @@
 		</test>
 		<test name='9'>
 			<description>Organizer adds RRULE</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1285,7 +1285,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1299,14 +1299,14 @@
 		</test>
 		<test name='11'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='12'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1320,14 +1320,14 @@
 		</test>
 		<test name='13'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -1341,14 +1341,14 @@
 		</test>
 		<test name='14'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='15'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1362,7 +1362,7 @@
 		</test>
 		<test name='16'>
 			<description>Organizer removes RRULE</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -1376,7 +1376,7 @@
 		</test>
 		<test name='17'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1390,14 +1390,14 @@
 		</test>
 		<test name='18'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='19'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1411,14 +1411,14 @@
 		</test>
 		<test name='20'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -1432,14 +1432,14 @@
 		</test>
 		<test name='21'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='22'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitrecur2.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -41,7 +41,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Initial event' ignore='no'>
+	<test-suite name='Initial event'>
 		<test name='1'>
 			<description>Organizer invites one Attendee</description>
 			<request>
@@ -129,7 +129,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Organizer invites other Attendee to one instance only' ignore='no'>
+	<test-suite name='Organizer invites other Attendee to one instance only'>
 		<test name='1'>
 			<description>Organizer invites one Attendee</description>
 			<request>
@@ -239,7 +239,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Organizer truncate' ignore='no'>
+	<test-suite name='Organizer truncate'>
 		<test name='1'>
 			<description>Organizer truncates and removes instance for Attendee 2</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitreschedule.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,7 +37,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Non-recurring' ignore='no'>
+	<test-suite name='Non-recurring'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request>
@@ -196,7 +196,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Recurring overridden' ignore='no'>
+	<test-suite name='Recurring overridden'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario2.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -41,10 +41,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Simple Changes' ignore='no'>
+	<test-suite name='Simple Changes'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -58,7 +58,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -72,18 +72,18 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -94,7 +94,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -108,14 +108,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 1 -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -129,14 +129,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -150,7 +150,7 @@
 		</test>
 		<test name='10'>
 			<description>Attendee 2 no Inbox Item</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath3:/</ruri>
 				<header>
@@ -172,7 +172,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee 2 data changed</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -186,14 +186,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee 2 -> Decline</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -207,14 +207,14 @@
 		</test>
 		<test name='13'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='14'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -228,7 +228,7 @@
 		</test>
 		<test name='16'>
 			<description>Attendee 1 no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -250,7 +250,7 @@
 		</test>
 		<test name='17'>
 			<description>Attendee 1 data changed</description>
-			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -288,10 +288,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='DST Shift change' change-uid='yes' ignore='no'>
+	<test-suite name='DST Shift change' change-uid='yes'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -305,7 +305,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -319,14 +319,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -340,14 +340,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 1 -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -361,14 +361,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -382,14 +382,14 @@
 		</test>
 		<test name='10'>
 			<description>Attendee -> Decline one instance</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -403,14 +403,14 @@
 		</test>
 		<test name='11'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='12'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscenario3.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,10 +37,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Initial event' ignore='no'>
+	<test-suite name='Initial event'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -54,7 +54,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -68,14 +68,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -89,14 +89,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 1 -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -110,14 +110,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -131,10 +131,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='First cancel' ignore='no'>
+	<test-suite name='First cancel'>
 		<test name='1'>
 			<description>Organizer cancels one instance for Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -148,7 +148,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -162,14 +162,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -183,14 +183,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 1 update</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -204,7 +204,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer no Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -226,7 +226,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -240,10 +240,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Second cancel' ignore='no'>
+	<test-suite name='Second cancel'>
 		<test name='1'>
 			<description>Organizer cancels another instance for Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -257,7 +257,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -271,14 +271,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 2</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -292,14 +292,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 1 update</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -310,7 +310,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -324,7 +324,7 @@
 		</test>
 		<test name='7'>
 			<description>Organizer no Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -346,7 +346,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitschedulechanges.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -117,7 +117,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='yes'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -540,7 +540,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='yes'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -860,7 +860,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='yes'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -923,7 +923,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='yes'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitscheduletag.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -44,7 +44,7 @@
 	<test-suite name='No schedule-tag'>
 		<test name='1'>
 			<description>Create new event - no header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -65,7 +65,7 @@
 		</test>
 		<test name='2'>
 			<description>No property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -90,7 +90,7 @@
 	<test-suite name='Update to resource with schedule-tag behavior'>
 		<test name='1'>
 			<description>Updated event has schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -115,7 +115,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -137,14 +137,14 @@
 		</test>
 		<test name='3a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3b'>
 			<description>New attendee event has schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -165,7 +165,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -190,7 +190,7 @@
 	<test-suite name='Change to resource with schedule-tag behavior'>
 		<test name='1'>
 			<description>Updated event has schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -215,7 +215,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -237,14 +237,14 @@
 		</test>
 		<test name='3a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3b'>
 			<description>New attendee event has schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -265,7 +265,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -290,7 +290,7 @@
 	<test-suite name='Organizer change to resource with valid If-Schedule-Tag-Match'>
 		<test name='1'>
 			<description>Updated event has schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -319,7 +319,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -341,14 +341,14 @@
 		</test>
 		<test name='3a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3b'>
 			<description>Attendee event has new schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -369,7 +369,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -394,7 +394,7 @@
 	<test-suite name='Organizer change to resource with invalid If-Schedule-Tag-Match'>
 		<test name='1'>
 			<description>Updated event has schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -416,7 +416,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -438,7 +438,7 @@
 		</test>
 		<test name='3a'>
 			<description>Attendee No Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -460,7 +460,7 @@
 		</test>
 		<test name='3b'>
 			<description>Attendee event has same schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -477,7 +477,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -502,14 +502,14 @@
 	<test-suite name='Attendee non-PARTSTAT change to resource with valid If-Schedule-Tag-Match'>
 		<test name='1'>
 			<description>Updated event has schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<header>
@@ -538,7 +538,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -560,7 +560,7 @@
 		</test>
 		<test name='3a'>
 			<description>Organizer No Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -582,7 +582,7 @@
 		</test>
 		<test name='3b'>
 			<description>Organizer event has same schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -599,7 +599,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -624,7 +624,7 @@
 	<test-suite name='Attendee change to resource with invalid If-Schedule-Tag-Match'>
 		<test name='1'>
 			<description>Updated event has schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<header>
@@ -646,7 +646,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -668,7 +668,7 @@
 		</test>
 		<test name='3a'>
 			<description>Organizer No Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -690,7 +690,7 @@
 		</test>
 		<test name='3b'>
 			<description>Organizer event has same schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -707,7 +707,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -732,7 +732,7 @@
 	<test-suite name='Remove resource schedule-tag behavior'>
 		<test name='1'>
 			<description>Updated event has schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -750,14 +750,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -792,7 +792,7 @@
 	<test-suite name='New resource schedule-tag behavior'>
 		<test name='1'>
 			<description>New event has schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -817,7 +817,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -839,14 +839,14 @@
 		</test>
 		<test name='3a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3b'>
 			<description>New attendee event has schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -867,7 +867,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -889,14 +889,14 @@
 		</test>
 		<test name='5a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='5b'>
 			<description>New attendee event has schedule tag header</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -917,7 +917,7 @@
 		</test>
 		<test name='6'>
 			<description>Matching property</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -942,7 +942,7 @@
 	<test-suite name='Organizer change'>
 		<test name='1'>
 			<description>Updated event has changed schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -971,7 +971,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -998,14 +998,14 @@
 		</test>
 		<test name='3a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3b'>
 			<description>Attendee event has changed schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1026,7 +1026,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -1053,14 +1053,14 @@
 		</test>
 		<test name='5a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='5b'>
 			<description>New attendee event has changed schedule tag header</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -1081,7 +1081,7 @@
 		</test>
 		<test name='6'>
 			<description>Matching property</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -1111,14 +1111,14 @@
 	<test-suite name='Attendee 02 change'>
 		<test name='1'>
 			<description>Updated event has changed schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<header>
@@ -1147,7 +1147,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -1174,14 +1174,14 @@
 		</test>
 		<test name='3a'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='3b'>
 			<description>Organizer has same schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -1198,7 +1198,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1225,7 +1225,7 @@
 		</test>
 		<test name='5'>
 			<description>Attendee has same schedule tag header</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -1242,7 +1242,7 @@
 		</test>
 		<test name='6'>
 			<description>Matching property</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -1272,14 +1272,14 @@
 	<test-suite name='Attendee 03 change'>
 		<test name='1'>
 			<description>Updated event has changed schedule tag header</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<header>
@@ -1308,7 +1308,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -1335,14 +1335,14 @@
 		</test>
 		<test name='3a'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='3b'>
 			<description>Organizer has same schedule tag header</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -1359,7 +1359,7 @@
 		</test>
 		<test name='4'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1386,7 +1386,7 @@
 		</test>
 		<test name='5'>
 			<description>Attendee has same schedule tag header</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1403,7 +1403,7 @@
 		</test>
 		<test name='6'>
 			<description>Matching property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -1433,7 +1433,7 @@
 	<test-suite name='Organizer Merge'>
 		<test name='1'>
 			<description>Updated event that has changed on disk</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1462,7 +1462,7 @@
 		</test>
 		<test name='2'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1489,7 +1489,7 @@
 		</test>
 		<test name='3'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -1503,14 +1503,14 @@
 		</test>
 		<test name='4a'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4b'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1524,14 +1524,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -1545,14 +1545,14 @@
 		</test>
 		<test name='6a'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='6b'>
 			<description>Updated event that has changed on disk</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1581,7 +1581,7 @@
 		</test>
 		<test name='7'>
 			<description>Matching property</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<header>
@@ -1608,7 +1608,7 @@
 		</test>
 		<test name='8'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -1625,7 +1625,7 @@
 	<test-suite name='Attendee Merge'>
 		<test name='1'>
 			<description>Get current schedule tag header values</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -1643,7 +1643,7 @@
 					<variable>$schedule-tag-organizer:</variable>
 				</grabheader>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1661,7 +1661,7 @@
 					<variable>$schedule-tag-attendee02:</variable>
 				</grabheader>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -1682,14 +1682,14 @@
 		</test>
 		<test name='2a'>
 			<description>Attendee 02 -> Declined</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<header>
@@ -1718,21 +1718,21 @@
 		</test>
 		<test name='2b'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='3a'>
 			<description>Attendee 03 -> Accepted</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<header>
@@ -1761,14 +1761,14 @@
 		</test>
 		<test name='3b'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:" wait-for-success="yes">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -1814,7 +1814,7 @@
 	<test-suite name='Organizer Delete with ETag'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<data>
@@ -1828,7 +1828,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -1846,14 +1846,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1867,14 +1867,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -1888,14 +1888,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<verify>
@@ -1909,7 +1909,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer deletes data with invalid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<header>
@@ -1927,7 +1927,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer deletes data with valid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/3.ics</ruri>
 				<header>
@@ -1945,14 +1945,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has cancelled data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1966,7 +1966,7 @@
 		</test>
 		<test name='14'>
 			<description>Attendee deletes data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 				<verify>
@@ -1992,7 +1992,7 @@
 	<test-suite name='Organizer Delete with Schedule-Tag'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<data>
@@ -2006,7 +2006,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>
@@ -2024,14 +2024,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2045,14 +2045,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -2066,14 +2066,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<verify>
@@ -2087,7 +2087,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer deletes data with invalid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<header>
@@ -2105,7 +2105,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer deletes data with valid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/4.ics</ruri>
 				<header>
@@ -2123,14 +2123,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has cancelled data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2144,7 +2144,7 @@
 		</test>
 		<test name='14'>
 			<description>Attendee deletes data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 				<verify>
@@ -2170,7 +2170,7 @@
 	<test-suite name='Organizer MOVE with ETag'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<data>
@@ -2184,7 +2184,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2202,14 +2202,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2223,14 +2223,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -2244,14 +2244,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2265,7 +2265,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer moves data with invalid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<header>
@@ -2287,7 +2287,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer deletes data with valid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<header>
@@ -2309,7 +2309,7 @@
 		</test>
 		<test name='12'>
 			<description>Attendee no Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -2350,7 +2350,7 @@
 	<test-suite name='Organizer MOVE with Schedule-Tag'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<data>
@@ -2364,7 +2364,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<verify>
@@ -2382,14 +2382,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2403,14 +2403,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -2424,14 +2424,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<verify>
@@ -2445,7 +2445,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer moves data with invalid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<header>
@@ -2467,7 +2467,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer moves data with valid ETag match</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<header>
@@ -2489,7 +2489,7 @@
 		</test>
 		<test name='12'>
 			<description>Attendee No Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -2530,7 +2530,7 @@
 	<test-suite name='Organizer Re-invite with Schedule-Tag'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<data>
@@ -2544,7 +2544,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2562,14 +2562,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2583,14 +2583,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -2604,14 +2604,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2625,7 +2625,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer changes data with valid Schedule-Tag match</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<header>
@@ -2647,7 +2647,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2665,14 +2665,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2705,7 +2705,7 @@
 	<test-suite name='Attendee change with Schedule-Tag after other Attendee change'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<data>
@@ -2719,7 +2719,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2737,18 +2737,18 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendees have data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2763,7 +2763,7 @@
 					<variable>$schedule-tag-attendee2:</variable>
 				</grabheader>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
@@ -2777,14 +2777,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee 3 -> Accepted/Declined one instance</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -2798,14 +2798,14 @@
 		</test>
 		<test name='6'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='7'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2819,14 +2819,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee 2 -> Accepted all instances with If-Schedule-Tag-Match</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<header>
@@ -2844,7 +2844,7 @@
 		</test>
 		<test name='9'>
 			<description>Attendees checks data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -2858,14 +2858,14 @@
 		</test>
 		<test name='10'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='11'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<verify>
@@ -2906,7 +2906,7 @@
 	<test-suite name='ETag change with Schedule-tag'>
 		<test name='1'>
 			<description>New event</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -2917,18 +2917,18 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath3:/</ruri>
 			</request>
 		</test>
 		<test name='2'>
 			<description>Get event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -2946,7 +2946,7 @@
 		</test>
 		<test name='3'>
 			<description>Add alarm</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -2960,7 +2960,7 @@
 		</test>
 		<test name='4'>
 			<description>Get event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>
@@ -2992,7 +2992,7 @@
 		</test>
 		<test name='5'>
 			<description>Remove alarm</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -3006,7 +3006,7 @@
 		</test>
 		<test name='6'>
 			<description>Get event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitsequence.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,7 +37,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Lower Sequence' ignore='no'>
+	<test-suite name='Lower Sequence'>
 		<test name='1'>
 			<description>Organizer invites Attendee: SEQUENCE:0</description>
 			<request>
@@ -182,7 +182,7 @@
 		</test>
 	</test-suite>
 		
-	<test-suite name='Recreate with Lower Sequence' ignore='no'>
+	<test-suite name='Recreate with Lower Sequence'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitsharing.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -74,7 +74,7 @@
 		<request user="$userid3:" pswd="$pswd3:">
 			<method>POST</method>
 			<ruri>$calendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3.xml</filepath>
 			</data>
@@ -121,7 +121,7 @@
 		<request user="$userid3:" pswd="$pswd3:">
 			<method>POST</method>
 			<ruri>$calendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply23.xml</filepath>
 			</data>
@@ -132,7 +132,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Organizer shared calendar' ignore='no'>
+	<test-suite name='Organizer shared calendar'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicittimezones.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,10 +37,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Change event spanning a DST transition with R-IDs on either side' ignore='no'>
+	<test-suite name='Change event spanning a DST transition with R-IDs on either side'>
 		<test name='1'>
 			<description>Organizer invites Attendee</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -54,7 +54,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -68,14 +68,14 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -89,14 +89,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -110,14 +110,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -131,7 +131,7 @@
 		</test>
 		<test name='10'>
 			<description>Organizer truncates</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -145,7 +145,7 @@
 		</test>
 		<test name='11'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -159,14 +159,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/limits.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='Limits in properties' ignore='no'>
+	<test-suite name='Limits in properties'>
 		<test name='1'>
 			<description>max-collections property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -53,7 +53,7 @@
 		</test>
 		<test name='2'>
 			<description>max-resources property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -75,13 +75,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Collection limit' ignore='no'>
-		<test name='1a' count='48' ignore='no'>
+	<test-suite name='Collection limit'>
+		<test name='1a' count='48'>
 			<exclude-feature>
 				<feature>split-calendars</feature>
 			</exclude-feature>
 			<description>Create collections to one below the limit</description>
-			<request end-delete='yes' print-response='no'>
+			<request end-delete='yes'>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/caltest-##/</ruri>
 				<verify>
@@ -93,12 +93,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='1b' count='47' ignore='no'>
+		<test name='1b' count='47'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
 			<description>Create collections to one below the limit</description>
-			<request end-delete='yes' print-response='no'>
+			<request end-delete='yes'>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/caltest-##/</ruri>
 				<verify>
@@ -110,9 +110,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Create collections to the limit</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/caltest-49/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-dropbox.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -103,7 +103,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -132,7 +132,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Add attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -192,7 +192,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -208,7 +208,7 @@
 		</test>
 		<test name='5'>
 			<description>One dropbox</description>
-			<request print-response="yes">
+			<request>
 				<method>FINDNEW</method>
 				<ruri>$dropboxpath1:/</ruri>
 				<graburi>$dropboxchild1:</graburi>
@@ -292,7 +292,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>Try to create a resource</description>
 			<request end-delete="yes">
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-implicit.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -30,7 +30,7 @@
 	<start/>
 	
 	<test-suite name='Add attachment then invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -44,7 +44,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -94,7 +94,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -119,7 +119,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Invite attendee</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -135,14 +135,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -154,7 +154,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -181,14 +181,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee -> Accepted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -202,14 +202,14 @@
 		</test>
 		<test name='9'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='10'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -221,7 +221,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Uninvite attendee</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -237,14 +237,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='13'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -256,7 +256,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -281,7 +281,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -297,7 +297,7 @@
 	</test-suite>
 
 	<test-suite name='Add attachment then invite - attendee deletes' change-uid='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -311,7 +311,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -361,7 +361,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -386,7 +386,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Invite attendee</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -402,14 +402,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -421,7 +421,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -448,14 +448,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee deletes</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 				<verify>
@@ -465,14 +465,14 @@
 		</test>
 		<test name='9'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='10'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -484,7 +484,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -509,7 +509,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -525,7 +525,7 @@
 	</test-suite>
 
 	<test-suite name='Invite then add, update, remove attachment' change-uid='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Invite attendee</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -541,14 +541,14 @@
 		</test>
 		<test name='2'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -560,7 +560,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Add attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -612,14 +612,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -631,7 +631,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -656,7 +656,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Update attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -708,14 +708,14 @@
 		</test>
 		<test name='9'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='10'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -727,7 +727,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -752,7 +752,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Remove attachment</description>
 			<request>
 				<method>POST</method>
@@ -772,14 +772,14 @@
 		</test>
 		<test name='13'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='14'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -791,7 +791,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -816,7 +816,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -835,7 +835,7 @@
 	</test-suite>
 
 	<test-suite name='Attendee cannot add attachment via post' change-uid='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Invite attendee</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -851,14 +851,14 @@
 		</test>
 		<test name='2'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='3'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -871,7 +871,7 @@
 				<graburi>$attendee2_data:</graburi>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Add attachment (with prefer) - fails</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -899,7 +899,7 @@
 		</test>
 		<test name='5'>
 			<description>Attendee data unchanged</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -913,7 +913,7 @@
 		</test>
 		<test name='6'>
 			<description>Organizer data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -925,7 +925,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -944,7 +944,7 @@
 	</test-suite>
 
 	<test-suite name='Attendee cannot update or remove attachment via post' change-uid='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -958,7 +958,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -1008,7 +1008,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1033,7 +1033,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Invite attendee</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1049,14 +1049,14 @@
 		</test>
 		<test name='5'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='6'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1069,7 +1069,7 @@
 				<graburi>$attendee2_data:</graburi>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1094,7 +1094,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Update attachment (with prefer) - fails</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -1122,7 +1122,7 @@
 		</test>
 		<test name='9'>
 			<description>Data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1133,7 +1133,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$attendee2_data:</ruri>
 				<verify>
@@ -1145,7 +1145,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1170,7 +1170,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Remove attachment (with prefer) - fails</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -1194,7 +1194,7 @@
 		</test>
 		<test name='12'>
 			<description>Data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1205,7 +1205,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$attendee2_data:</ruri>
 				<verify>
@@ -1217,7 +1217,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1242,7 +1242,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>
@@ -1262,7 +1262,7 @@
 
 
 	<test-suite name='Attendee cannot add, update, remove attachment via edit' change-uid='yes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1276,7 +1276,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -1326,7 +1326,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1351,7 +1351,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT attendee event</description>
 			<request user="$userid2:" pswd="$pswd2:" end-delete='no'>
 				<method>PUT</method>
@@ -1365,7 +1365,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Add attendee event attachment (with prefer)</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -1419,7 +1419,7 @@
 				<ruri>1</ruri>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1444,7 +1444,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Invite attendee</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1460,14 +1460,14 @@
 		</test>
 		<test name='8'>
 			<description>Attendee Inbox Item</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='9'>
 			<description>Attendee has data</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -1480,7 +1480,7 @@
 				<graburi>$attendee2_data:</graburi>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1505,7 +1505,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Add attachment - fails silently</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
@@ -1521,7 +1521,7 @@
 		</test>
 		<test name='12'>
 			<description>Data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1532,7 +1532,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$attendee2_data:</ruri>
 				<verify>
@@ -1544,7 +1544,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Update attachment - fails silently</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
@@ -1560,7 +1560,7 @@
 		</test>
 		<test name='14'>
 			<description>Data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1571,7 +1571,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$attendee2_data:</ruri>
 				<verify>
@@ -1583,7 +1583,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Remove attachment - fails silently</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
@@ -1599,7 +1599,7 @@
 		</test>
 		<test name='16'>
 			<description>Data unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -1610,7 +1610,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$attendee2_data:</ruri>
 				<verify>
@@ -1622,7 +1622,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
+		<test name='17'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1647,7 +1647,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>Check access to attachment</description>
 			<request>
 				<method>GET</method>
@@ -1672,7 +1672,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean-up</description>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-quota.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,9 +31,9 @@
 	<start/>
 	
 	<test-suite name='Simple non-recurring, non-scheduled add attachment no prefer'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>
@@ -62,7 +62,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -76,9 +76,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>
@@ -103,7 +103,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -137,9 +137,9 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>
@@ -168,7 +168,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Update attachment</description>
 			<request>
 				<method>POST</method>
@@ -202,9 +202,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>
@@ -233,7 +233,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -243,9 +243,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-recurrence.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -30,7 +30,7 @@
 	<start/>
 	
 	<test-suite name='Cannot add attachment to instance'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -59,7 +59,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment (no prefer)</description>
 			<request>
 				<method>POST</method>
@@ -89,7 +89,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for no ATTACH property</description>
 			<request>
 				<method>GET</method>
@@ -103,7 +103,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -116,7 +116,7 @@
 	</test-suite>
 
 	<test-suite name='Recurring with override, update attachment'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -145,7 +145,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -205,7 +205,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -219,7 +219,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Update attachment</description>
 			<request>
 				<method>POST</method>
@@ -283,7 +283,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -297,7 +297,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -307,7 +307,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -321,7 +321,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments-sharing.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -33,7 +33,7 @@
 			<method>MKCALENDAR</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>POST</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -44,11 +44,11 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>GETNEW</method>
 			<ruri>$notificationpath2:/</ruri>
 			<grabelement>
@@ -60,10 +60,10 @@
 				<variable>$hosturl2:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>POST</method>
 			<ruri>$calendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 			</data>
@@ -72,11 +72,11 @@
 				<variable>$sharedcalendar2:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath3:/</ruri>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>GETNEW</method>
 			<ruri>$notificationpath3:/</ruri>
 			<grabelement>
@@ -88,10 +88,10 @@
 				<variable>$hosturl3:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>POST</method>
 			<ruri>$calendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3.xml</filepath>
 			</data>
@@ -103,7 +103,7 @@
 	</start>
 	
 	<test-suite name='Sharer add attachment'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -132,7 +132,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Sharer add attachment</description>
 			<request>
 				<method>POST</method>
@@ -188,7 +188,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -202,7 +202,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -227,7 +227,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -241,7 +241,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Remove attachment</description>
 			<request>
 				<method>POST</method>
@@ -259,7 +259,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -273,7 +273,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -298,7 +298,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -312,7 +312,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -325,7 +325,7 @@
 	</test-suite>
 
 	<test-suite name='Sharee add attachment'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -354,7 +354,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Read-only sharee cannot add attachment</description>
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
@@ -380,7 +380,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Sharee can add attachment</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -436,7 +436,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -450,7 +450,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -475,7 +475,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -489,7 +489,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Read-only sharee cannot remove attachment</description>
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
@@ -507,7 +507,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Sharee remove attachment</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -525,7 +525,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -539,7 +539,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -564,7 +564,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -578,7 +578,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -591,7 +591,7 @@
 	</test-suite>
 
 	<test-suite name='Sharee add attachment existing managed-id'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -620,7 +620,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Sharer add attachment</description>
 			<request>
 				<method>POST</method>
@@ -692,7 +692,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -706,7 +706,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -731,7 +731,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -745,7 +745,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PUT another event</description>
 			<request user="$userid2:" pswd="$pswd2:" end-delete='no'>
 				<method>PUT</method>
@@ -806,7 +806,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -820,7 +820,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -845,7 +845,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -859,7 +859,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -869,7 +869,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -882,7 +882,7 @@
 	</test-suite>
 
 	<test-suite name='No access after move'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -911,7 +911,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Sharer add attachment</description>
 			<request>
 				<method>POST</method>
@@ -967,7 +967,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -981,7 +981,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -1006,7 +1006,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -1020,9 +1020,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Move</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<header>
@@ -1034,7 +1034,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -1048,7 +1048,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -1073,7 +1073,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -1087,7 +1087,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -1097,7 +1097,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -1114,7 +1114,7 @@
 	</test-suite>
 
 	<test-suite name='No access after unshare'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1143,7 +1143,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Sharer add attachment</description>
 			<request>
 				<method>POST</method>
@@ -1199,7 +1199,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -1213,7 +1213,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -1238,7 +1238,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -1252,9 +1252,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Unshare</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -1266,7 +1266,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -1280,7 +1280,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -1305,7 +1305,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -1319,7 +1319,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -1331,10 +1331,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Direct share' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Direct share'>
+		<test name='1'>
 			<description>Add user02 as read write for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -1350,9 +1350,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add user03 as read write for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -1370,7 +1370,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharees do direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -1381,7 +1381,7 @@
 					<variable>$sharedcalendar2:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -1393,7 +1393,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1422,7 +1422,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Read-only sharee cannot add attachment</description>
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
@@ -1448,7 +1448,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee can add attachment</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -1504,7 +1504,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -1518,7 +1518,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -1543,7 +1543,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -1557,7 +1557,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Read-only sharee cannot remove attachment</description>
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
@@ -1575,7 +1575,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Sharee remove attachment</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -1593,7 +1593,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Check for attachment - sharer</description>
 			<request>
 				<method>GET</method>
@@ -1607,7 +1607,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Check for attachment - sharees</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -1632,7 +1632,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Check for attachment - non sharee</description>
 			<request user="$userid4:" pswd="$pswd4:">
 				<method>GET</method>
@@ -1646,7 +1646,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Delete calendar data</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
@@ -1670,9 +1670,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>Clear user02 as read-write proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -1688,9 +1688,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
+		<test name='17'>
 			<description>Clear user03 as read-only proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/managed-attachments.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -32,7 +32,7 @@
 	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -46,7 +46,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for options header tag on calendar</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -64,9 +64,9 @@
 		<require-feature>
 			<feature>attachments-collection</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Check for schedule privilege on iTIP Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/$attachments:/</ruri>
 				<header>
@@ -95,7 +95,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment no prefer'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -124,7 +124,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment (no prefer)</description>
 			<request>
 				<method>POST</method>
@@ -157,7 +157,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for ATTACH property</description>
 			<request>
 				<method>GET</method>
@@ -202,7 +202,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -216,7 +216,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No access for anyone else</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -230,7 +230,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No access for anyone else</description>
 			<request auth="no">
 				<method>GET</method>
@@ -244,7 +244,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Remove attachment (no prefer)</description>
 			<request>
 				<method>POST</method>
@@ -254,7 +254,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for no ATTACH property</description>
 			<request>
 				<method>GET</method>
@@ -275,7 +275,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -289,7 +289,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -302,7 +302,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment with prefer'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -331,7 +331,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -391,7 +391,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for ATTACH property</description>
 			<request>
 				<method>GET</method>
@@ -436,7 +436,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -450,7 +450,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Remove attachment (with prefer)</description>
 			<request>
 				<method>POST</method>
@@ -468,7 +468,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check for no ATTACH property</description>
 			<request>
 				<method>GET</method>
@@ -489,7 +489,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -503,7 +503,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -516,7 +516,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled resource with attachment removal'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -545,7 +545,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -605,7 +605,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -619,7 +619,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -629,7 +629,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -646,7 +646,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled remove attachment'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -675,7 +675,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -735,7 +735,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -749,7 +749,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Remove attachment</description>
 			<request>
 				<method>POST</method>
@@ -778,7 +778,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -792,7 +792,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -802,7 +802,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -819,7 +819,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled remove attachment invalid'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -848,7 +848,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -912,7 +912,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -926,7 +926,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Remove attachment fails</description>
 			<request>
 				<method>POST</method>
@@ -948,7 +948,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for unchanged ATTACH property</description>
 			<request>
 				<method>GET</method>
@@ -989,7 +989,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1003,7 +1003,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -1013,7 +1013,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1030,7 +1030,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled update attachment'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1059,7 +1059,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -1119,7 +1119,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1133,7 +1133,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Update attachment</description>
 			<request>
 				<method>POST</method>
@@ -1197,7 +1197,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1211,7 +1211,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -1221,7 +1221,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1235,7 +1235,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1252,7 +1252,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled update attachment invalid'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1281,7 +1281,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -1345,7 +1345,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1359,7 +1359,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Update attachment fails</description>
 			<request>
 				<method>POST</method>
@@ -1385,7 +1385,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for unchanged ATTACH property</description>
 			<request>
 				<method>GET</method>
@@ -1426,7 +1426,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1440,7 +1440,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -1450,7 +1450,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1467,7 +1467,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment - invalid managed-id'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1488,7 +1488,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment - someone elses managed-id'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1514,7 +1514,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -1590,7 +1590,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1604,7 +1604,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT event by other user</description>
 			<request user="$userid2:" pswd="$pswd2:" end-delete='no'>
 				<method>PUT</method>
@@ -1626,7 +1626,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1651,7 +1651,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Delete calendar data</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
@@ -1661,7 +1661,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1686,7 +1686,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Delete original calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -1696,7 +1696,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1713,7 +1713,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment existing managed-id'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1739,7 +1739,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -1815,7 +1815,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1829,7 +1829,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT another event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -1890,7 +1890,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1904,7 +1904,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Update original attachment</description>
 			<request>
 				<method>POST</method>
@@ -1956,7 +1956,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1970,7 +1970,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -1984,7 +1984,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Delete original calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -1994,7 +1994,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2008,7 +2008,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -2018,7 +2018,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2032,7 +2032,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2049,7 +2049,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment on update - invalid managed-id'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2063,7 +2063,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2084,7 +2084,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment update existing managed-id'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2110,7 +2110,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -2186,7 +2186,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2200,7 +2200,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT event another event without attachment</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2226,7 +2226,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PUT update other event to add attachment</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2287,7 +2287,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2301,7 +2301,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PUT to remove original attachment</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2323,7 +2323,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2337,7 +2337,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2351,7 +2351,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete original calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -2361,7 +2361,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2375,7 +2375,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Delete calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -2385,7 +2385,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2402,7 +2402,7 @@
 	</test-suite>
 
 	<test-suite name='Simple non-recurring, non-scheduled add attachment update trying to change property'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT event</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2428,7 +2428,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add attachment</description>
 			<request>
 				<method>POST</method>
@@ -2504,7 +2504,7 @@
 				</grabcalparameter>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2518,7 +2518,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT update other event to change attachment</description>
 			<request end-delete='no'>
 				<method>PUT</method>
@@ -2540,7 +2540,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>
@@ -2554,7 +2554,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Delete original calendar data</description>
 			<request>
 				<method>DELETE</method>
@@ -2564,7 +2564,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check for attachment</description>
 			<request>
 				<method>GET</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -308,7 +308,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Non-ascii calendar data' ignore="no">
+	<test-suite name='Non-ascii calendar data'>
 		<test name='1'>
 			<description>PUT with non-ascii data</description>
 			<request end-delete="yes">
@@ -389,7 +389,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Non-utf-8 calendar data' ignore="no">
+	<test-suite name='Non-utf-8 calendar data'>
 		<test name='1'>
 			<description>PUT with non-utf-8 data without charset</description>
 			<request end-delete="yes">
@@ -446,7 +446,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Copy/Move Non-utf-8 calendar data' ignore="no">
+	<test-suite name='Copy/Move Non-utf-8 calendar data'>
 		<require-feature>
 			<feature>regular-collection</feature>
 		</require-feature>
@@ -502,7 +502,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name="POSTs" ignore='no'>
+	<test-suite name="POSTs">
 		<test name='1'>
 			<description>POST with utf-8 data</description>
 			<request>
@@ -545,13 +545,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name="PUT with CN re-write" ignore='no'>
+	<test-suite name="PUT with CN re-write">
 		<test name='1'>
 			<description>PUT without CN</description>
 			<request user="$i18nid:" pswd="$i18npswd:" end-delete="yes">
 				<method>PUT</method>
 				<ruri>$i18ncalendarpath:/cntest.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/nonascii/13.ics</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-calendaruserproxy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-calendaruserproxy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -48,10 +48,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Proxy on node #2' ignore="no">
+	<test-suite name='Proxy on node #2'>
 		<test name='1'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -70,7 +70,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal2:</ruri>
 				<data>
@@ -89,7 +89,7 @@
 		</test>
 		<test name='3'>
 			<description>Verify no access to resource</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -103,7 +103,7 @@
 		</test>
 		<test name='4'>
 			<description>Add other02 as read proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -118,7 +118,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -137,7 +137,7 @@
 		</test>
 		<test name='5'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<header>
@@ -160,7 +160,7 @@
 		</test>
 		<test name='6'>
 			<description>Verify single group membership</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<header>
@@ -183,7 +183,7 @@
 		</test>
 		<test name='7'>
 			<description>Verify access to resource</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -197,7 +197,7 @@
 		</test>
 		<test name='8'>
 			<description>Verify no access for scheduling</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -223,7 +223,7 @@
 		</test>
 		<test name='9'>
 			<description>Clear other02 as read-only proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -238,7 +238,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -257,7 +257,7 @@
 		</test>
 		<test name='10'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -276,7 +276,7 @@
 		</test>
 		<test name='11'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<data>
@@ -295,7 +295,7 @@
 		</test>
 		<test name='12'>
 			<description>Verify no access to resource</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -309,7 +309,7 @@
 		</test>
 		<test name='13'>
 			<description>Add other02 as read-write proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -324,7 +324,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -343,7 +343,7 @@
 		</test>
 		<test name='14'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<header>
@@ -366,7 +366,7 @@
 		</test>
 		<test name='15'>
 			<description>Verify single group membership</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<header>
@@ -389,7 +389,7 @@
 		</test>
 		<test name='16'>
 			<description>Verify access to resource</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -403,7 +403,7 @@
 		</test>
 		<test name='17'>
 			<description>Verify access to resource</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -417,7 +417,7 @@
 		</test>
 		<test name='18'>
 			<description>Verify access for scheduling</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -439,7 +439,7 @@
 		</test>
 		<test name='19'>
 			<description>Verify no access for scheduling</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -465,7 +465,7 @@
 		</test>
 		<test name='20'>
 			<description>Clear other02 as read-write proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -480,7 +480,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -499,7 +499,7 @@
 		</test>
 		<test name='21'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -518,7 +518,7 @@
 		</test>
 		<test name='22'>
 			<description>Verify no group memberships right now</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<data>
@@ -537,7 +537,7 @@
 		</test>
 		<test name='23'>
 			<description>Verify no access to resource</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -551,10 +551,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Proxy on node #1' ignore="no">
+	<test-suite name='Proxy on node #1'>
 		<test name='1'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<data>
@@ -573,7 +573,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principal2:</ruri>
 				<data>
@@ -592,7 +592,7 @@
 		</test>
 		<test name='3'>
 			<description>Verify no access to resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$othercalendarpath2:/1.ics</ruri>
 				<verify>
@@ -606,7 +606,7 @@
 		</test>
 		<test name='4'>
 			<description>Add user02 as read proxy for other02</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$otherprincipal2:calendar-proxy-read/</ruri>
 				<data>
@@ -621,7 +621,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:calendar-proxy-read/</ruri>
 				<data>
@@ -640,7 +640,7 @@
 		</test>
 		<test name='5'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<header>
@@ -663,7 +663,7 @@
 		</test>
 		<test name='6'>
 			<description>Verify single group membership</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principal2:</ruri>
 				<header>
@@ -686,7 +686,7 @@
 		</test>
 		<test name='7'>
 			<description>Verify access to resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$othercalendarpath2:/1.ics</ruri>
 				<verify>
@@ -700,7 +700,7 @@
 		</test>
 		<test name='8'>
 			<description>Verify no access for scheduling</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$otheroutboxpath1:/</ruri>
 				<header>
@@ -726,7 +726,7 @@
 		</test>
 		<test name='9'>
 			<description>Clear user02 as read-only proxy for other02</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$otherprincipal2:calendar-proxy-read/</ruri>
 				<data>
@@ -741,7 +741,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:calendar-proxy-read/</ruri>
 				<data>
@@ -760,7 +760,7 @@
 		</test>
 		<test name='10'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<data>
@@ -779,7 +779,7 @@
 		</test>
 		<test name='11'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -798,7 +798,7 @@
 		</test>
 		<test name='12'>
 			<description>Verify no access to resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$othercalendarpath2:/1.ics</ruri>
 				<verify>
@@ -812,7 +812,7 @@
 		</test>
 		<test name='13'>
 			<description>Add user02 as read-write proxy for other02</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$otherprincipal2:calendar-proxy-write/</ruri>
 				<data>
@@ -827,7 +827,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:calendar-proxy-write/</ruri>
 				<data>
@@ -846,7 +846,7 @@
 		</test>
 		<test name='14'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<header>
@@ -869,7 +869,7 @@
 		</test>
 		<test name='15'>
 			<description>Verify single group membership</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principal2:</ruri>
 				<header>
@@ -892,7 +892,7 @@
 		</test>
 		<test name='16'>
 			<description>Verify access to resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$othercalendarpath2:/1.ics</ruri>
 				<verify>
@@ -906,7 +906,7 @@
 		</test>
 		<test name='17'>
 			<description>Verify access to resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$othercalendarpath2:/1.ics</ruri>
 				<data>
@@ -920,7 +920,7 @@
 		</test>
 		<test name='18'>
 			<description>Verify access for scheduling</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$otheroutboxpath1:/</ruri>
 				<header>
@@ -942,7 +942,7 @@
 		</test>
 		<test name='19'>
 			<description>Verify no access for scheduling</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$otheroutboxpath1:/</ruri>
 				<header>
@@ -968,7 +968,7 @@
 		</test>
 		<test name='20'>
 			<description>Clear user02 as read-write proxy for other02</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$otherprincipal2:calendar-proxy-write/</ruri>
 				<data>
@@ -983,7 +983,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:calendar-proxy-write/</ruri>
 				<data>
@@ -1002,7 +1002,7 @@
 		</test>
 		<test name='21'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherprincipal2:</ruri>
 				<data>
@@ -1021,7 +1021,7 @@
 		</test>
 		<test name='22'>
 			<description>Verify no group memberships right now</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response="no">
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principal2:</ruri>
 				<data>
@@ -1040,7 +1040,7 @@
 		</test>
 		<test name='23'>
 			<description>Verify no access to resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$othercalendarpath2:/1.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicit.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicit.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicit.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -36,10 +36,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 refresh across nodes' ignore='no'>
+	<test-suite name='#1 refresh across nodes'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -53,7 +53,7 @@
 		</test>
 		<test name='2'>
 			<description>Organizer checks data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -67,18 +67,18 @@
 		</test>
 		<test name='3'>
 			<description>Attendee Inbox Items</description>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$otherinboxpath1:/</ruri>
 			</request>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>WAITDELETEALL 1</method>
 				<ruri>$otherinboxpath2:/</ruri>
 			</request>
 		</test>
 		<test name='4'>
 			<description>Attendees have data</description>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>GETNEW</method>
 				<ruri>$othercalendarpath1:/</ruri>
 				<verify>
@@ -89,7 +89,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GETNEW</method>
 				<ruri>$othercalendarpath2:/</ruri>
 				<verify>
@@ -103,14 +103,14 @@
 		</test>
 		<test name='6'>
 			<description>Attendee 1 -> Accepted</description>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>GETNEW</method>
 				<ruri>$othercalendarpath1:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -124,14 +124,14 @@
 		</test>
 		<test name='7'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='8'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -145,7 +145,7 @@
 		</test>
 		<test name='10'>
 			<description>Attendee 2 no Inbox Item</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PROPFIND</method>
 				<ruri>$otherinboxpath2:/</ruri>
 				<header>
@@ -167,7 +167,7 @@
 		</test>
 		<test name='11'>
 			<description>Attendee 2 data changed</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GETNEW</method>
 				<ruri>$othercalendarpath2:/</ruri>
 				<verify>
@@ -181,14 +181,14 @@
 		</test>
 		<test name='12'>
 			<description>Attendee 2 -> Decline</description>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>GETNEW</method>
 				<ruri>$othercalendarpath2:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$otherid2:" pswd="$otherpswd2:" print-response='no'>
+			<request user="$otherid2:" pswd="$otherpswd2:">
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>
@@ -202,14 +202,14 @@
 		</test>
 		<test name='13'>
 			<description>Organizer Inbox Item</description>
-			<request print-response='no'>
+			<request>
 				<method>WAITDELETEALL 1</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
 		</test>
 		<test name='14'>
 			<description>Organizer data changed</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -223,7 +223,7 @@
 		</test>
 		<test name='16'>
 			<description>Attendee 1 no Inbox Item</description>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>PROPFIND</method>
 				<ruri>$otherinboxpath1:/</ruri>
 				<header>
@@ -245,7 +245,7 @@
 		</test>
 		<test name='17'>
 			<description>Attendee 1 data changed</description>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response='no'>
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>GETNEW</method>
 				<ruri>$othercalendarpath1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicitauto.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicitauto.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-scheduleimplicitauto.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -38,8 +38,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 node 2 user auto-schedules with node #1 resource' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='#1 node 2 user auto-schedules with node #1 resource'>
+		<test name='1'>
 			<description>Create new event</description>
 			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>PUT</method>
@@ -53,16 +53,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in other01 Inbox</description>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response="no">
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$otherinboxpath1:/</ruri>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in other01 Calendar</description>
-			<request user="$otherid1:" pswd="$otherpswd1:" print-response="no">
+			<request user="$otherid1:" pswd="$otherpswd1:">
 				<method>GET</method>
 				<ruri>$othercalendarpath1:/1.ics</ruri>
 				<verify>
@@ -74,9 +74,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -96,9 +96,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One item in user02 calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$calendarpath2:/</ruri>
 				<verify>
@@ -110,9 +110,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
 				<ruri>$rinboxpath1:/</ruri>
 				<data>
@@ -128,9 +128,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>One item in resource01 Calendar</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$rcalendarpath1:/</ruri>
 				<verify>
@@ -142,7 +142,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Clean-up inboxes</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/partitioning-simple.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,7 +28,7 @@
 
 	<start/>
 	
-	<test-suite name='Access principals' ignore='no'>
+	<test-suite name='Access principals'>
 		<test name='1'>
 			<description>PROPFIND of user on node #1 as user on node #1</description>
 			<request>
@@ -103,7 +103,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Access calendar homes' ignore='no'>
+	<test-suite name='Access calendar homes'>
 		<test name='1'>
 			<description>PROPFIND of user on node #1 as user on node #1</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/polls.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -113,8 +113,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT VPOLL' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PUT VPOLL'>
+		<test name='1'>
 			<description>PUT unscheduled empty poll</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -139,7 +139,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT unscheduled event poll</description>
 			<request end-delete='yes'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/prefer.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/prefer.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/prefer.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -358,7 +358,7 @@
 		</require-feature>
 		<test name='1'>
 			<description>PROPPATCH no prefer</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -377,7 +377,7 @@
 		</test>
 		<test name='2'>
 			<description>PROPPATCH with Prefer=x-foo</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -400,7 +400,7 @@
 		</test>
 		<test name='3'>
 			<description>PROPPATCH with Prefer:return=minimal</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privatecomments.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -45,7 +45,7 @@
 	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/privateevents.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -177,10 +177,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<data>
@@ -198,10 +198,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='DAV:owner' ignore='no'>
+	<test-suite name='DAV:owner'>
 		<test name='1'>
 			<description>Check for no DAV:owner on root</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$root:</ruri>
 				<header>
@@ -223,7 +223,7 @@
 		</test>
 		<test name='2'>
 			<description>Check for no DAV:owner on user calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendars_uids:</ruri>
 				<header>
@@ -245,7 +245,7 @@
 		</test>
 		<test name='3'>
 			<description>Check for no DAV:owner on principal</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<header>
@@ -267,7 +267,7 @@
 		</test>
 		<test name='4'>
 			<description>Check for DAV:owner on calendar home</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -289,7 +289,7 @@
 		</test>
 		<test name='5'>
 			<description>Check for DAV:owner on calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -311,7 +311,7 @@
 		</test>
 		<test name='6'>
 			<description>Check for DAV:owner on calendar resource</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -333,7 +333,7 @@
 		</test>
 		<test name='7'>
 			<description>Check for DAV:owner on other user's calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -355,10 +355,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='No X-CALENDARSERVER-ACCESS on Outbox' ignore='no'>
+	<test-suite name='No X-CALENDARSERVER-ACCESS on Outbox'>
 		<test name='1'>
 			<description>Do POST on Outbox with wrong data</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -376,10 +376,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT behavior without access' ignore='no'>
+	<test-suite name='PUT behavior without access'>
 		<test name='1'>
 			<description>PUT without access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/1.ics</ruri>
 				<data>
@@ -393,7 +393,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/1.ics</ruri>
 				<verify>
@@ -403,7 +403,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/1.ics</ruri>
 				<verify>
@@ -413,7 +413,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/1.ics</ruri>
 				<verify>
@@ -423,7 +423,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/1.ics</ruri>
 				<data>
@@ -437,7 +437,7 @@
 		</test>
 		<test name='6'>
 			<description>PUT by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/1.ics</ruri>
 				<data>
@@ -455,7 +455,7 @@
 		</test>
 		<test name='7'>
 			<description>PROPFIND by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -478,7 +478,7 @@
 		</test>
 		<test name='8'>
 			<description>PROPFIND by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -501,7 +501,7 @@
 		</test>
 		<test name='9'>
 			<description>PROPFIND by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -524,10 +524,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT behavior with PUBLIC access' ignore='no'>
+	<test-suite name='PUT behavior with PUBLIC access'>
 		<test name='1'>
 			<description>PUT with access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<data>
@@ -541,7 +541,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -566,7 +566,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -591,7 +591,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -616,7 +616,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<data>
@@ -630,7 +630,7 @@
 		</test>
 		<test name='6'>
 			<description>PUT by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<data>
@@ -648,7 +648,7 @@
 		</test>
 		<test name='7'>
 			<description>PROPFIND by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -672,7 +672,7 @@
 		</test>
 		<test name='8'>
 			<description>PROPFIND by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -696,7 +696,7 @@
 		</test>
 		<test name='9'>
 			<description>PROPFIND by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -720,10 +720,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT re-write behavior with PUBLIC access' ignore='no'>
+	<test-suite name='PUT re-write behavior with PUBLIC access'>
 		<test name='1'>
 			<description>Overwrite PUT with no access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<data>
@@ -737,7 +737,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -762,7 +762,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -787,7 +787,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -812,7 +812,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<data>
@@ -826,7 +826,7 @@
 		</test>
 		<test name='6'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -851,7 +851,7 @@
 		</test>
 		<test name='7'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -876,10 +876,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT behavior with PRIVATE access' ignore='no'>
+	<test-suite name='PUT behavior with PRIVATE access'>
 		<test name='1'>
 			<description>PUT with access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<data>
@@ -893,7 +893,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -918,7 +918,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -932,7 +932,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -946,7 +946,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<data>
@@ -964,7 +964,7 @@
 		</test>
 		<test name='6'>
 			<description>PUT by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<data>
@@ -982,7 +982,7 @@
 		</test>
 		<test name='7'>
 			<description>PROPFIND by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1007,7 +1007,7 @@
 		</test>
 		<test name='8'>
 			<description>PROPFIND by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1035,7 +1035,7 @@
 		</test>
 		<test name='9'>
 			<description>PROPFIND by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1063,10 +1063,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT re-write behavior with PRIVATE access' ignore='no'>
+	<test-suite name='PUT re-write behavior with PRIVATE access'>
 		<test name='1'>
 			<description>Overwrite PUT with no access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<data>
@@ -1080,7 +1080,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -1105,7 +1105,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -1119,7 +1119,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -1133,7 +1133,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<data>
@@ -1151,10 +1151,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT behavior with CONFIDENTIAL access' ignore='no'>
+	<test-suite name='PUT behavior with CONFIDENTIAL access'>
 		<test name='1'>
 			<description>PUT with access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<data>
@@ -1168,7 +1168,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -1195,7 +1195,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -1226,7 +1226,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -1257,7 +1257,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<data>
@@ -1275,7 +1275,7 @@
 		</test>
 		<test name='6'>
 			<description>PUT by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<data>
@@ -1293,7 +1293,7 @@
 		</test>
 		<test name='7'>
 			<description>PROPFIND by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1319,7 +1319,7 @@
 		</test>
 		<test name='8'>
 			<description>PROPFIND by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1348,7 +1348,7 @@
 		</test>
 		<test name='9'>
 			<description>PROPFIND by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1377,10 +1377,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT re-write behavior with CONFIDENTIAL access' ignore='no'>
+	<test-suite name='PUT re-write behavior with CONFIDENTIAL access'>
 		<test name='1'>
 			<description>Overwrite PUT with no access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<data>
@@ -1394,7 +1394,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -1421,7 +1421,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -1452,7 +1452,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -1483,7 +1483,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<data>
@@ -1501,10 +1501,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT behavior with RESTRICTED access' ignore='no'>
+	<test-suite name='PUT behavior with RESTRICTED access'>
 		<test name='1'>
 			<description>PUT with access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<data>
@@ -1518,7 +1518,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -1545,7 +1545,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -1576,7 +1576,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -1607,7 +1607,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<data>
@@ -1625,7 +1625,7 @@
 		</test>
 		<test name='6'>
 			<description>PUT by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<data>
@@ -1643,7 +1643,7 @@
 		</test>
 		<test name='7'>
 			<description>PROPFIND by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1670,7 +1670,7 @@
 		</test>
 		<test name='8'>
 			<description>PROPFIND by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1700,7 +1700,7 @@
 		</test>
 		<test name='9'>
 			<description>PROPFIND by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<header>
@@ -1730,10 +1730,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT re-write behavior with RESTRICTED access' ignore='no'>
+	<test-suite name='PUT re-write behavior with RESTRICTED access'>
 		<test name='1'>
 			<description>Overwrite PUT with no access by user01</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<data>
@@ -1747,7 +1747,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -1774,7 +1774,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -1805,7 +1805,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -1836,7 +1836,7 @@
 		</test>
 		<test name='5'>
 			<description>PUT by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<data>
@@ -1854,10 +1854,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget href tests' ignore='no'>
+	<test-suite name='multiget href tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -1879,7 +1879,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -1904,7 +1904,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -1929,10 +1929,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget PUBLIC tests' ignore='no'>
+	<test-suite name='multiget PUBLIC tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -1958,7 +1958,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -1984,7 +1984,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2010,10 +2010,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget CONFIDENTIAL all data tests' ignore='no'>
+	<test-suite name='multiget CONFIDENTIAL all data tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2041,7 +2041,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2073,7 +2073,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2105,10 +2105,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget RESTRICTED all data tests' ignore='no'>
+	<test-suite name='multiget RESTRICTED all data tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2136,7 +2136,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2168,7 +2168,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2200,10 +2200,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget CONFIDENTIAL partial data tests' ignore='no'>
+	<test-suite name='multiget CONFIDENTIAL partial data tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2234,7 +2234,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2266,7 +2266,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2298,10 +2298,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget RESTRICTED partial data tests' ignore='no'>
+	<test-suite name='multiget RESTRICTED partial data tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2332,7 +2332,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2364,7 +2364,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2396,10 +2396,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query href tests' ignore='no'>
+	<test-suite name='query href tests'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2421,7 +2421,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2442,7 +2442,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2463,10 +2463,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query PUBLIC tests' ignore='no'>
+	<test-suite name='query PUBLIC tests'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2492,7 +2492,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2518,7 +2518,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2544,10 +2544,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query CONFIDENTIAL all data tests' ignore='no'>
+	<test-suite name='query CONFIDENTIAL all data tests'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2575,7 +2575,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2607,7 +2607,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2639,10 +2639,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query RESTRICTED all data tests' ignore='no'>
+	<test-suite name='query RESTRICTED all data tests'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2670,7 +2670,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2702,7 +2702,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2734,10 +2734,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query CONFIDENTIAL partial data tests' ignore='no'>
+	<test-suite name='query CONFIDENTIAL partial data tests'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2768,7 +2768,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2800,7 +2800,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2832,10 +2832,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query RESTRICTED partial data tests' ignore='no'>
+	<test-suite name='query RESTRICTED partial data tests'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2866,7 +2866,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2898,7 +2898,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2930,10 +2930,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query no match SUMMARY' ignore='no'>
+	<test-suite name='query no match SUMMARY'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2955,7 +2955,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2975,7 +2975,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -2995,10 +2995,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query no match LOCATION' ignore='no'>
+	<test-suite name='query no match LOCATION'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3017,7 +3017,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3035,7 +3035,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3053,10 +3053,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query no match ORGANIZER' ignore='no'>
+	<test-suite name='query no match ORGANIZER'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3075,7 +3075,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3089,7 +3089,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3103,10 +3103,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='query no match VALARM' ignore='no'>
+	<test-suite name='query no match VALARM'>
 		<test name='1'>
 			<description>query by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3127,7 +3127,7 @@
 		</test>
 		<test name='2'>
 			<description>query by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3145,7 +3145,7 @@
 		</test>
 		<test name='3'>
 			<description>query by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -3163,13 +3163,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='COPY tests' ignore='no'>
+	<test-suite name='COPY tests'>
 		<exclude-feature>
 			<feature>no-duplicate-uids</feature>
 		</exclude-feature>
 		<test name='1'>
 			<description>copy to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/fromcalendar/1.ics</ruri>
 				<header>
@@ -3183,7 +3183,7 @@
 		</test>
 		<test name='2'>
 			<description>copy to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/fromcalendar/2.ics</ruri>
 				<header>
@@ -3197,7 +3197,7 @@
 		</test>
 		<test name='3'>
 			<description>copy to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/fromcalendar/3.ics</ruri>
 				<header>
@@ -3211,7 +3211,7 @@
 		</test>
 		<test name='4'>
 			<description>copy to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/fromcalendar/4.ics</ruri>
 				<header>
@@ -3225,7 +3225,7 @@
 		</test>
 		<test name='5'>
 			<description>copy to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/fromcalendar/5.ics</ruri>
 				<header>
@@ -3239,7 +3239,7 @@
 		</test>
 		<test name='6'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3261,7 +3261,7 @@
 		</test>
 		<test name='7'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3286,7 +3286,7 @@
 		</test>
 		<test name='8'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3311,13 +3311,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='COPY PUBLIC tests' ignore='no'>
+	<test-suite name='COPY PUBLIC tests'>
 		<exclude-feature>
 			<feature>no-duplicate-uids</feature>
 		</exclude-feature>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3343,7 +3343,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3369,7 +3369,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3395,13 +3395,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='COPY CONFIDENTIAL all data tests' ignore='no'>
+	<test-suite name='COPY CONFIDENTIAL all data tests'>
 		<exclude-feature>
 			<feature>no-duplicate-uids</feature>
 		</exclude-feature>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3428,7 +3428,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3458,7 +3458,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3488,13 +3488,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='COPY RESTRICTED all data tests' ignore='no'>
+	<test-suite name='COPY RESTRICTED all data tests'>
 		<exclude-feature>
 			<feature>no-duplicate-uids</feature>
 		</exclude-feature>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3521,7 +3521,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3551,7 +3551,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/copycalendar/</ruri>
 				<data>
@@ -3581,10 +3581,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='MOVE tests' ignore='no'>
+	<test-suite name='MOVE tests'>
 		<test name='1'>
 			<description>move to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/fromcalendar/1.ics</ruri>
 				<header>
@@ -3598,7 +3598,7 @@
 		</test>
 		<test name='2'>
 			<description>move to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/fromcalendar/2.ics</ruri>
 				<header>
@@ -3612,7 +3612,7 @@
 		</test>
 		<test name='3'>
 			<description>move to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/fromcalendar/3.ics</ruri>
 				<header>
@@ -3626,7 +3626,7 @@
 		</test>
 		<test name='4'>
 			<description>move to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/fromcalendar/4.ics</ruri>
 				<header>
@@ -3640,7 +3640,7 @@
 		</test>
 		<test name='5'>
 			<description>move to calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/fromcalendar/5.ics</ruri>
 				<header>
@@ -3654,7 +3654,7 @@
 		</test>
 		<test name='6'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3676,7 +3676,7 @@
 		</test>
 		<test name='7'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3701,7 +3701,7 @@
 		</test>
 		<test name='8'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3726,10 +3726,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='MOVE PUBLIC tests' ignore='no'>
+	<test-suite name='MOVE PUBLIC tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3755,7 +3755,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3781,7 +3781,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3807,10 +3807,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='MOVE CONFIDENTIAL all data tests' ignore='no'>
+	<test-suite name='MOVE CONFIDENTIAL all data tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3837,7 +3837,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3867,7 +3867,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3897,10 +3897,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='MOVE RESTRICTED all data tests' ignore='no'>
+	<test-suite name='MOVE RESTRICTED all data tests'>
 		<test name='1'>
 			<description>multiget by user01</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3927,7 +3927,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3957,7 +3957,7 @@
 		</test>
 		<test name='3'>
 			<description>multiget by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/movecalendar/</ruri>
 				<data>
@@ -3987,10 +3987,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Rolled up data tests' ignore='no'>
+	<test-suite name='Rolled up data tests'>
 		<test name='1'>
 			<description>get by user01</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/rolledcalendar/</ruri>
 				<verify>
@@ -4004,7 +4004,7 @@
 		</test>
 		<test name='2'>
 			<description>get by user02</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/rolledcalendar/</ruri>
 				<verify>
@@ -4018,7 +4018,7 @@
 		</test>
 		<test name='3'>
 			<description>get by user03</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/rolledcalendar/</ruri>
 				<verify>
@@ -4032,10 +4032,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Admin access' ignore='no'>
+	<test-suite name='Admin access'>
 		<test name='1'>
 			<description>GET by admin normal</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/1.ics</ruri>
 				<verify>
@@ -4049,7 +4049,7 @@
 		</test>
 		<test name='2'>
 			<description>GET by admin PUBLIC</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/2.ics</ruri>
 				<verify>
@@ -4063,7 +4063,7 @@
 		</test>
 		<test name='3'>
 			<description>GET by admin PRIVATE</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/3.ics</ruri>
 				<verify>
@@ -4077,7 +4077,7 @@
 		</test>
 		<test name='4'>
 			<description>GET by admin RESTRICTED</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/4.ics</ruri>
 				<verify>
@@ -4091,7 +4091,7 @@
 		</test>
 		<test name='5'>
 			<description>GET by admin CONFIDENTIAL</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/sharedcalendar/5.ics</ruri>
 				<verify>
@@ -4105,7 +4105,7 @@
 		</test>
 		<test name='6'>
 			<description>multiget by admin PUBLIC</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4131,7 +4131,7 @@
 		</test>
 		<test name='7'>
 			<description>multiget by admin PRIVATE</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4153,7 +4153,7 @@
 		</test>
 		<test name='8'>
 			<description>multiget by admin CONFIDENTIAL</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4181,7 +4181,7 @@
 		</test>
 		<test name='9'>
 			<description>multiget by admin RESTRICTED</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4212,7 +4212,7 @@
 		</test>
 		<test name='10'>
 			<description>query by admin PUBLIC</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4238,7 +4238,7 @@
 		</test>
 		<test name='11'>
 			<description>query by admin PRIVATE</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4260,7 +4260,7 @@
 		</test>
 		<test name='12'>
 			<description>query by admin CONFIDENTIAL</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4288,7 +4288,7 @@
 		</test>
 		<test name='13'>
 			<description>multiget by admin RESTRICTED</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/sharedcalendar/</ruri>
 				<data>
@@ -4316,7 +4316,7 @@
 		</test>
 		<test name='14'>
 			<description>Rolled-up get by admin</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/rolledcalendar/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/proppatch.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/proppatch.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/proppatch.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -25,10 +25,10 @@
 
 	<start/>
 	
-	<test-suite name='prop patches' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches'>
+		<test name='1'>
 			<description>PROPPATCH of details: good</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -44,7 +44,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -65,9 +65,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPPATCH of details: remove it</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -82,7 +82,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -106,9 +106,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH remove non-existant</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -124,9 +124,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPPATCH of resourcetype: fails</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -143,7 +143,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -169,7 +169,7 @@
 		</test>
 		<test name='5'>
 			<description>PROPPATCH of encoded value</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -184,7 +184,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -204,9 +204,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PROPPATCH non-existent calendar</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/bogus-calendar/</ruri>
 				<data>
@@ -225,9 +225,9 @@
 	</test-suite>
 	
 	<test-suite name='prop patch property attributes'>
-		<test name='1' ignore="no">
+		<test name='1'>
 			<description>PROPPATCH with property XML attribute</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -242,7 +242,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -269,9 +269,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>PROPPATCH of details: remove it</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -286,7 +286,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/proxyauthz.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/proxyauthz.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/proxyauthz.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -85,10 +85,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Valid Proxy User' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Valid Proxy User'>
+		<test name='1'>
 			<description>GET user01 resource</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -100,9 +100,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>GET user02 resource</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarhome2:/visibletouser01/visible2.ics</ruri>
 				<header>
@@ -114,7 +114,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
@@ -127,7 +127,7 @@
 					<filepath>Resource/CalDAV/acls/20.xml</filepath>
 				</data>
 			</request>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarhome2:/visibletouser01/hidden1.ics</ruri>
 				<header>
@@ -143,9 +143,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>GET user02 resource</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarhome2:/notvisibletouser01/hidden1.ics</ruri>
 				<header>
@@ -163,10 +163,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Wrong Proxy User' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Wrong Proxy User'>
+		<test name='1'>
 			<description>GET user01 resource</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<header>
@@ -182,12 +182,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>GET user02 resource</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarhome2:/visibletouser01/visible2.ics</ruri>
 				<header>
@@ -203,12 +203,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>GET user02 resource</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarhome2:/visibletouser01/hidden1.ics</ruri>
 				<header>
@@ -220,12 +220,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<require-feature>
 				<feature>per-object-ACLs</feature>
 			</require-feature>
 			<description>GET user02 resource</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarhome2:/notvisibletouser01/hidden1.ics</ruri>
 				<header>
@@ -243,10 +243,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Invalid Proxy User' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Invalid Proxy User'>
+		<test name='1'>
 			<description>Valid proxy without header</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<verify>
@@ -258,9 +258,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Valid proxy proxying as another proxy</description>
-			<request user="$userproxy:" pswd="$pswdproxy:" print-response='no'>
+			<request user="$userproxy:" pswd="$pswdproxy:">
 				<method>GET</method>
 				<ruri>$calendarhome2:/visibletouser01/visible2.ics</ruri>
 				<header>
@@ -276,9 +276,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Regular user trying to proxy</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome2:/visibletouser01/visible2.ics</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/put.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,8 +27,8 @@
 
 	<start/>
 	
-	<test-suite name='PUT VEVENT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PUT VEVENT'>
+		<test name='1'>
 			<description>PUT non-recurring timed event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -60,7 +60,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>regular-collection</feature>
 			</require-feature>
@@ -88,7 +88,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PUT non-recurring timed event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -115,8 +115,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Put VTODO' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Put VTODO'>
+		<test name='1'>
 			<description>Plain VTODO with no date</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -141,7 +141,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Plain VTODO with DUE only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -166,7 +166,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Plain VTODO with DTSTART/DUARTION only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -191,7 +191,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Plain VTODO with DTSTART only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -216,7 +216,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Plain VTODO with COMPLETED only</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -243,8 +243,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Problem VEVENTs - EXDATE &amp; various combinations of date-time/date values' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Problem VEVENTs - EXDATE &amp; various combinations of date-time/date values'>
+		<test name='1'>
 			<description>PUT problem event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -258,7 +258,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>DTSTART/DATE-TIME/UTC, DTEND/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -272,7 +272,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>DTSTART/DATE-TIME/TZID, DTEND/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -286,7 +286,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>DTSTART/DATE-TIME/Float, DTEND/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -300,7 +300,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>DTSTART/DATE-TIME/UTC, DTEND/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -314,7 +314,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>DTSTART/DATE-TIME/UTC, DTEND/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -328,7 +328,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>DTSTART/DATE-TIME/TZID, DTEND/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -342,7 +342,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>DTSTART/DATE-TIME/TZID, DTEND/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -356,7 +356,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>DTSTART/DATE-TIME/Float, DTEND/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -370,7 +370,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>DTSTART/DATE-TIME/Float, DTEND/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -384,7 +384,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>RECURRENCE-ID component before master</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -400,8 +400,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Problem VTODOs - various combinations of date-time/date values' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Problem VTODOs - various combinations of date-time/date values'>
+		<test name='1'>
 			<description>DTSTART/DATE-TIME/UTC, DUE/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -415,7 +415,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>DTSTART/DATE-TIME/TZID, DUE/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -429,7 +429,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>DTSTART/DATE-TIME/Float, DUE/DATE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -443,7 +443,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>DTSTART/DATE, DUE/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -457,7 +457,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>DTSTART/DATE, DUE/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -471,7 +471,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>DTSTART/DATE, DUE/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -485,7 +485,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>DTSTART/DATE-TIME/UTC, DUE/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -499,7 +499,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>DTSTART/DATE-TIME/UTC, DUE/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -513,7 +513,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>DTSTART/DATE-TIME/TZID, DUE/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -527,7 +527,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>DTSTART/DATE-TIME/TZID, DUE/DATE-TIME/Float</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -541,7 +541,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>DTSTART/DATE-TIME/Float, DUE/DATE-TIME/UTC</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -555,7 +555,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>DTSTART/DATE-TIME/Float, DUE/DATE-TIME/TZID</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -571,8 +571,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT with Content-Type parameters' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PUT with Content-Type parameters'>
+		<test name='1'>
 			<description>PUT</description>
 			<request>
 				<method>PUT</method>
@@ -586,7 +586,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>GET</description>
 			<request>
 				<method>GET</method>
@@ -600,7 +600,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPFIND</description>
 			<request>
 				<method>PROPFIND</method>
@@ -622,7 +622,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<require-feature>
 				<feature>regular-collection</feature>
 			</require-feature>
@@ -635,7 +635,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<require-feature>
 				<feature>regular-collection</feature>
 			</require-feature>
@@ -652,7 +652,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<require-feature>
 				<feature>regular-collection</feature>
 			</require-feature>
@@ -669,7 +669,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<require-feature>
 				<feature>regular-collection</feature>
 			</require-feature>
@@ -697,7 +697,7 @@
 	</test-suite>
 
 	<test-suite name='PUT with RRULE truncation' ignore='yes'> <!-- We no longer do RRULE truncation -->
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>RRULE - no truncation count</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -729,7 +729,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>RRULE - no truncation until</description>
 			<request>
 				<method>PUT</method>
@@ -761,7 +761,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>RRULE - truncation count</description>
 			<request>
 				<method>PUT</method>
@@ -793,7 +793,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>RRULE - truncation until</description>
 			<request>
 				<method>PUT</method>
@@ -825,7 +825,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>RRULE - no truncation unbounded yearly</description>
 			<request>
 				<method>PUT</method>
@@ -857,7 +857,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>RRULE - truncation unbounded daily</description>
 			<request>
 				<method>PUT</method>
@@ -892,7 +892,7 @@
 	</test-suite>
 
 	<test-suite name='PUT with relaxed parsing'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Invalid duration value</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -917,7 +917,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Decode \ in URIs</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -945,7 +945,7 @@
 	</test-suite>
 
 	<test-suite name='PUT with X- using VALUE != TEXT'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Invalid duration value</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -973,7 +973,7 @@
 	</test-suite>
 
 	<test-suite name='PUTs with ^ parameter encoding'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Roundtrip encoded CN=</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -1004,7 +1004,7 @@
 		<require-feature>
 			<feature>remove-duplicate-alarms</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Roundtrip encoded CN=</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -1029,7 +1029,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Roundtrip encoded CN=</description>
 			<request end-delete='yes'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/quota.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='Quota enabled by default on calendar home and below only' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Quota enabled by default on calendar home and below only'>
+		<test name='1'>
 			<description>props on /calendars/</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendars:</ruri>
 				<header>
@@ -56,9 +56,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>props on /calendars/users/</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendars_users:</ruri>
 				<header>
@@ -83,9 +83,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>props on home</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -107,9 +107,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>props on calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarpath2:/</ruri>
 				<header>
@@ -131,9 +131,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>props on /principals/</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principalcollection:</ruri>
 				<header>
@@ -158,9 +158,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>props on /principals/users/</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principals_users:</ruri>
 				<header>
@@ -185,9 +185,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>props on principal</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$principaluri2:</ruri>
 				<header>
@@ -214,10 +214,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Quota after collection create' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Quota after collection create'>
+		<test name='1'>
 			<description>Create new calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome2:/newcalendar/</ruri>
 				<verify>
@@ -225,9 +225,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Quota check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -251,10 +251,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Quota after empty collection delete' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Quota after empty collection delete'>
+		<test name='1'>
 			<description>Create new calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$calendarhome2:/newcalendar/</ruri>
 				<verify>
@@ -262,9 +262,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Quota check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -288,10 +288,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Quota after collection create, and PUT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Quota after collection create, and PUT'>
+		<test name='1'>
 			<description>Create new calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome2:/newcalendar/</ruri>
 				<verify>
@@ -299,7 +299,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome2:/newcalendar/1.ics</ruri>
@@ -312,9 +312,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Quota check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<require-feature>
 					<feature>quota-on-resources</feature>
 				</require-feature>
@@ -338,7 +338,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>
@@ -365,10 +365,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Quota after non-empty collection delete' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Quota after non-empty collection delete'>
+		<test name='1'>
 			<description>Delete the calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$calendarhome2:/newcalendar/</ruri>
 				<verify>
@@ -376,9 +376,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Quota check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -402,11 +402,11 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Quota on dropbox' ignore='no'>
+	<test-suite name='Quota on dropbox'>
 		<require-feature>
 			<feature>dropbox</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Create event with attachment</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -434,9 +434,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<require-feature>
 					<feature>quota-on-resources</feature>
 				</require-feature>
@@ -460,7 +460,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>
@@ -499,9 +499,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<require-feature>
 					<feature>quota-on-resources</feature>
 				</require-feature>
@@ -525,7 +525,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>
@@ -560,9 +560,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Quota check</description>
-			<request print-response='no'>
+			<request>
 				<require-feature>
 					<feature>quota-on-resources</feature>
 				</require-feature>
@@ -586,7 +586,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<exclude-feature>
 					<feature>quota-on-resources</feature>
 				</exclude-feature>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/recurrenceput.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,7 +29,7 @@
 	<start/>
 	
 	<test-suite name='VEVENTs'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT non-recurring timed event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -43,7 +43,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT non-recurring all day event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -57,7 +57,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PUT recurring (no exceptions) timed event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -71,7 +71,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT recurring (no exceptions) all day event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -85,7 +85,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PUT recurring (with exceptions) timed event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -99,7 +99,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PUT recurring (with exceptions) all day event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -113,7 +113,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PUT recurring (with future exceptions) timed event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -127,7 +127,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>PUT recurring (with future exceptions) all day event</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -141,7 +141,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>PUT recurring with two exceptions 365 days apart</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -162,7 +162,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>PUT recurring with invalid override and master cancel</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -183,7 +183,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>PUT recurring with invalid cancelled override and master</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -206,8 +206,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='VTODOs' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='VTODOs'>
+		<test name='1'>
 			<description>Plain VTODO with no date - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -221,7 +221,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Plain VTODO with all-day DUE only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -235,7 +235,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Plain VTODO with all-day DTSTART/DURATION only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -249,7 +249,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Plain VTODO with all-day DTSTART only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -263,7 +263,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Plain VTODO with timed DUE only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -277,7 +277,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Plain VTODO with timed DTSTART/DURATION only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -291,7 +291,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Plain VTODO with timed DTSTART/DURATION only - recurring</description>
 			<request end-delete='yes'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/reports.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -245,13 +245,13 @@
 		</request>
 	</start>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
 			<description>Look for options header tag</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -265,13 +265,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget reports' ignore='no'>
-		<test name='1a' ignore='no'>
+	<test-suite name='multiget reports'>
+		<test name='1a'>
 			<description>basic multiget of 4 resources returning etag and entire ics data</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/1.txt</filepath>
 				</data>
@@ -310,7 +310,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='1b' ignore='no'>
+		<test name='1b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -318,7 +318,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$taskspath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/1b.xml</filepath>
 				</data>
@@ -339,12 +339,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>basic multiget of 4 resources returning etag and only VCALENDAR property data (no embedded components)</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/2.txt</filepath>
 				</data>
@@ -360,12 +360,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>basic multiget of 4 resources returning etag and only VTIMEZONE components</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/3.txt</filepath>
 				</data>
@@ -381,12 +381,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4a' ignore='no'>
+		<test name='4a'>
 			<description>basic multiget of 4 resources returning etag and only SUMMARY/UID properties inside VEVENT components and VALARMs</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/4.txt</filepath>
 				</data>
@@ -425,7 +425,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4b' ignore='no'>
+		<test name='4b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -433,7 +433,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$taskspath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/4b.xml</filepath>
 				</data>
@@ -454,12 +454,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5a' ignore='no'>
+		<test name='5a'>
 			<description>as 4.txt except that the SUMMARY property value is not returned</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/5.txt</filepath>
 				</data>
@@ -498,7 +498,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5b' ignore='no'>
+		<test name='5b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -506,7 +506,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$taskspath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/5b.xml</filepath>
 				</data>
@@ -527,12 +527,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Does allprop</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/6.txt</filepath>
 				</data>
@@ -548,12 +548,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Does propname</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/7.txt</filepath>
 				</data>
@@ -569,12 +569,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Single non-existent query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/multiget/8.xml</filepath>
 				</data>
@@ -596,8 +596,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='basic query reports' ignore='no'>
-		<test name='1a' ignore='no'>
+	<test-suite name='basic query reports'>
+		<test name='1a'>
 			<description>query for resources with VCALENDAR &amp; VEVENT defined</description>
 			<request>
 				<method>REPORT</method>
@@ -634,7 +634,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='1b' ignore='no'>
+		<test name='1b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -654,7 +654,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2a' ignore='no'>
+		<test name='2a'>
 			<description>query for resources with VCALENDAR &amp; VEVENT not defined</description>
 			<request>
 				<method>REPORT</method>
@@ -690,7 +690,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2b' ignore='no'>
+		<test name='2b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -716,7 +716,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
@@ -742,7 +742,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for resources where the SUMMARY in a VEVENT does not contain the character '1'</description>
 			<request>
 				<method>REPORT</method>
@@ -770,9 +770,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for resources where the DESCRIPTION property exists in a VEVENT</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -790,9 +790,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query for resources where the DESCRIPTION property does not exist in a VEVENT</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -826,7 +826,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci'</description>
 			<request>
 				<method>REPORT</method>
@@ -844,7 +844,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter not containing the text 'Paci'</description>
 			<request>
 				<method>REPORT</method>
@@ -878,7 +878,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' and 'Moun'</description>
 			<request>
 				<method>REPORT</method>
@@ -895,7 +895,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -917,7 +917,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '4' and has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
 			<request>
 				<method>REPORT</method>
@@ -936,7 +936,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -974,7 +974,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>query for resources where the RECURRENCE-ID in a VEVENT does not contain a RANGE parameter</description>
 			<request>
 				<method>REPORT</method>
@@ -993,7 +993,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14a' ignore='no'>
+		<test name='14a'>
 			<description>query for resources with VCALENDAR &amp; VTODO defined</description>
 			<request>
 				<method>REPORT</method>
@@ -1028,7 +1028,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14b' ignore='no'>
+		<test name='14b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -1054,7 +1054,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>query for resources where the SUMMARY in a VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
@@ -1072,7 +1072,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>query for resources that have a DUE in a VTODO that contains a TZID parameter containing the text 'East'</description>
 			<request>
 				<method>REPORT</method>
@@ -1092,7 +1092,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17a' ignore='no'>
+		<test name='17a'>
 			<description>query for resources with VCALENDAR &amp; VEVENT and VTODO defined</description>
 			<request>
 				<method>REPORT</method>
@@ -1109,7 +1109,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17b' ignore='no'>
+		<test name='17b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -1129,7 +1129,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18a' ignore='no'>
+		<test name='18a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1206,7 +1206,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18b' ignore='no'>
+		<test name='18b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -1233,7 +1233,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19a' ignore='no'>
+		<test name='19a'>
 			<description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
 			<request>
 				<method>REPORT</method>
@@ -1250,7 +1250,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19b' ignore='no'>
+		<test name='19b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -1270,7 +1270,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20a' ignore='no'>
+		<test name='20a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1321,7 +1321,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20b' ignore='no'>
+		<test name='20b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -1343,7 +1343,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='21'>
 			<description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' and a DUE in a VTODO with TZID containing 'East'</description>
 			<request>
 				<method>REPORT</method>
@@ -1360,7 +1360,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22a' ignore='no'>
+		<test name='22a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1397,7 +1397,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22b' ignore='no'>
+		<test name='22b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -1421,7 +1421,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23' ignore='no'>
+		<test name='23'>
 			<description>query for VEVENTs that do not contain VALARMs</description>
 			<request>
 				<method>REPORT</method>
@@ -1455,7 +1455,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24' ignore='no'>
+		<test name='24'>
 			<description>query for VEVENTs that contain a CATEGORY and filter by CATEGORY</description>
 			<request>
 				<method>REPORT</method>
@@ -1477,7 +1477,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='25' ignore='no'>
+		<test name='25'>
 			<description>query for VEVENTs that contain a CATEGORY but test with uppercase string</description>
 			<request>
 				<method>REPORT</method>
@@ -1499,9 +1499,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='26' ignore='no'>
+		<test name='26'>
 			<description>empty query</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -1513,7 +1513,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='27' ignore='no'>
+		<test name='27'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1534,7 +1534,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='28' ignore='no'>
+		<test name='28'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1555,7 +1555,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='29' ignore='no'>
+		<test name='29'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1576,7 +1576,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='30' ignore='no'>
+		<test name='30'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1603,7 +1603,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='31' ignore='no'>
+		<test name='31'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1632,7 +1632,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='32' ignore='no'>
+		<test name='32'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1655,7 +1655,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='33' ignore='no'>
+		<test name='33'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1676,7 +1676,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='34' ignore='no'>
+		<test name='34'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1701,8 +1701,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='query reports with filtered data' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='query reports with filtered data'>
+		<test name='1'>
 			<description>query for resources with VCALENDAR &amp; VEVENT defined - return filtered data</description>
 			<request>
 				<method>REPORT</method>
@@ -1727,7 +1727,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for resources with VCALENDAR &amp; VEVENT defined - return filtered data</description>
 			<request>
 				<method>REPORT</method>
@@ -1754,8 +1754,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='time-range query reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='time-range query reports'>
+		<test name='1'>
 			<description>query for VEVENTs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1776,7 +1776,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for VEVENT and VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1793,7 +1793,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1848,7 +1848,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for VEVENTs within time range with specific SUMMARY text</description>
 			<request>
 				<method>REPORT</method>
@@ -1866,7 +1866,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for VEVENT recurrence instance within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1884,7 +1884,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query for overridden VEVENT instance within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1902,7 +1902,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query for overridden VEVENT not within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1916,7 +1916,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query for overridden this-and-future VEVENT within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1934,7 +1934,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query for VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1954,7 +1954,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>query for VTODOs within time range with specific SUMMARY text</description>
 			<request>
 				<method>REPORT</method>
@@ -1972,7 +1972,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>query for VTODO recurrence instance within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -1992,7 +1992,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Invalid VTIMEZONE check</description>
 			<request>
 				<method>REPORT</method>
@@ -2010,9 +2010,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>query for VEVENTs within time range in distant future</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2031,7 +2031,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>query for VEVENTs within time range - no end</description>
 			<request>
 				<method>REPORT</method>
@@ -2064,7 +2064,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>query for VEVENTs within time range - no start</description>
 			<request>
 				<method>REPORT</method>
@@ -2089,7 +2089,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>query for VEVENTs within time range - no start and no end</description>
 			<request>
 				<method>REPORT</method>
@@ -2125,7 +2125,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>query for free busy with overlapping and consecutive events</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -2138,7 +2138,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2154,7 +2154,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19a' ignore='no'>
+		<test name='19a'>
 			<description>query for VEVENTS and VTODOs within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -2171,7 +2171,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19b' ignore='no'>
+		<test name='19b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -2191,7 +2191,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20a' ignore='no'>
+		<test name='20a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -2234,7 +2234,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20b' ignore='no'>
+		<test name='20b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -2258,7 +2258,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21a' ignore='no'>
+		<test name='21a'>
 			<description>query for VEVENTS and VTODOs with start only</description>
 			<request>
 				<method>REPORT</method>
@@ -2275,7 +2275,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21b' ignore='no'>
+		<test name='21b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -2295,7 +2295,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22a' ignore='no'>
+		<test name='22a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -2365,7 +2365,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22b' ignore='no'>
+		<test name='22b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -2390,7 +2390,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23a' ignore='no'>
+		<test name='23a'>
 			<description>query for VEVENTS with start only and all VTODOs</description>
 			<request>
 				<method>REPORT</method>
@@ -2407,7 +2407,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23b' ignore='no'>
+		<test name='23b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -2427,7 +2427,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24a' ignore='no'>
+		<test name='24a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -2499,7 +2499,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24b' ignore='no'>
+		<test name='24b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -2526,7 +2526,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='25' ignore='no'>
+		<test name='25'>
 			<require-feature>
 				<feature>timerange-low-limit</feature>
 			</require-feature>
@@ -2547,7 +2547,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='26' ignore='no'>
+		<test name='26'>
 			<require-feature>
 				<feature>timerange-low-limit</feature>
 			</require-feature>
@@ -2568,7 +2568,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='27' ignore='no'>
+		<test name='27'>
 			<require-feature>
 				<feature>timerange-low-limit</feature>
 			</require-feature>
@@ -2589,7 +2589,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='28' ignore='no'>
+		<test name='28'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2610,7 +2610,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='29' ignore='no'>
+		<test name='29'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2631,7 +2631,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='30' ignore='no'>
+		<test name='30'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2652,7 +2652,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='31' ignore='no'>
+		<test name='31'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2675,8 +2675,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='alarm time-range query reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='alarm time-range query reports'>
+		<test name='1'>
 			<description>query for VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -2694,7 +2694,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for repeating VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -2712,7 +2712,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for recurring VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -2731,7 +2731,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for recurring/overridden VALARMS within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -2750,7 +2750,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for VALARMS on VTODO within time range</description>
 			<request>
 				<method>REPORT</method>
@@ -2770,10 +2770,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='free-busy reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='free-busy reports'>
+		<test name='1'>
 			<description>query for free busy with time range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2807,9 +2807,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for free busy with overlapping and consecutive events</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2858,10 +2858,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='limit/expand recurrence in reports' ignore='no'>
+	<test-suite name='limit/expand recurrence in reports'>
 		<test name='1' ignore='yes'>
 			<description>time-range query with limit over same range</description>
-			<request print-response='yes'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2881,7 +2881,7 @@
 		</test>
 		<test name='2' ignore='yes'>
 			<description>time-range query with limit over different range</description>
-			<request print-response='yes'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2899,9 +2899,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>time-range query with expand over same range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2920,9 +2920,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>time-range query with expand over different range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2941,9 +2941,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query with limit-freebusy-set</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2971,9 +2971,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query with expand all-day - no timezone no match</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -2985,9 +2985,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query with expand all-day non-recurring - no timezone match</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -3011,9 +3011,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query with expand all-day recurring - no timezone match</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -3037,9 +3037,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query with expand all-day - timezone</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -3063,9 +3063,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>query with expand all-day - recurrence</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -3091,9 +3091,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>time-range query with expand for one event - DURATION test</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -3126,7 +3126,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>time-range query with expand for one recurring event skipping cancelled first instance</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -3150,7 +3150,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -3184,7 +3184,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>time-range query with expand for one recurring event shifted into time-range</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -3197,7 +3197,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/resourceid.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -41,9 +41,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/caltest1/</ruri>
 				<header>
@@ -81,9 +81,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/caltest-moved/</ruri>
 				<header>
@@ -106,9 +106,9 @@
 	</test-suite>
 
 	<test-suite name='Principals'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Check property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:</ruri>
 				<header>
@@ -128,9 +128,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principaluri1:</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/rscale.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,8 +27,8 @@
 
 	<start/>
 	
-	<test-suite name='PUT VEVENT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PUT VEVENT'>
+		<test name='1'>
 			<description>PUT event with RSCALE</description>
 			<request end-delete='yes'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/scheduleimplicit-compatability.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -42,10 +42,10 @@
 	</start>
 	
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -61,7 +61,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for options header tag on calendar</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -77,10 +77,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name="POSTs ignored" ignore='no'>
+	<test-suite name="POSTs ignored">
 		<test name='1'>
 			<description>Initial REQUEST</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -94,7 +94,7 @@
 		</test>
 		<test name='2'>
 			<description>Make sure no resource exists</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -116,7 +116,7 @@
 		</test>
 		<test name='3'>
 			<description>Make sure no resource exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -138,7 +138,7 @@
 		</test>
 		<test name='4'>
 			<description>Make sure no resource exists</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath3:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulenomore.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulenomore.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulenomore.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,8 +27,8 @@
 
 	<start/>
 	
-	<test-suite name='SCHEDULE Fails' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='SCHEDULE Fails'>
+		<test name='1'>
 			<description>SCHEDULE on valid outbox</description>
 			<request>
 				<method>SCHEDULE</method>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepost.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -116,10 +116,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='POST Errors' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='POST Errors'>
+		<test name='1'>
 			<description>POST on invalid outbox</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -135,7 +135,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST with invalid content</description>
 			<request>
 				<method>POST</method>
@@ -153,9 +153,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST with invalid calendar data</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -173,7 +173,7 @@
 		</test>
 		<test name='4'>
 			<description>POST without METHOD property</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -191,7 +191,7 @@
 		</test>
 		<test name='5'>
 			<description>POST with invalid iTIP object</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -207,9 +207,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>POST without Recipient:</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -225,7 +225,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>POST with non-authorized Organizer:</description>
 			<request>
 				<method>POST</method>
@@ -243,7 +243,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>POST reply with too many Attendees:</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -261,7 +261,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>POST reply with non-authorized Attendee:</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
@@ -279,7 +279,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>POST reply with disabled Attendee:</description>
 			<request>
 				<method>POST</method>
@@ -300,7 +300,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>POST reply with disabled Organizer:</description>
 			<request>
 				<method>POST</method>
@@ -320,10 +320,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name="POSTs" ignore='no'>
+	<test-suite name="POSTs">
 		<test name='1'>
 			<description>POST which should work</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -337,7 +337,7 @@
 		</test>
 		<test name='2'>
 			<description>Make sure no resource exists</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$outboxpath1:/</ruri>
 				<header>
@@ -363,7 +363,7 @@
 		</test>
 		<test name='3'>
 			<description>Make sure resource exists and properties are set</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -390,7 +390,7 @@
 		</test>
 		<test name='4'>
 			<description>Make sure resource exists and properties are set</description>
-			<request  user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request  user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath3:/</ruri>
 				<header>
@@ -417,7 +417,7 @@
 		</test>
 		<test name='5'>
 			<description>POST which should work (using relative principal addressing)</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -429,9 +429,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore="no">
+		<test name='6'>
 			<description>POST which should work (using absolute principal addressing)</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -445,10 +445,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name="Reports on Inbox/Outbox" ignore='no'>
+	<test-suite name="Reports on Inbox/Outbox">
 		<test name='1'>
 			<description>Simple calendar-query for VEVENTs</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -466,7 +466,7 @@
 		</test>
 		<test name='2'>
 			<description>Simple calendar-query for VEVENTs</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$inboxpath2:/</ruri>
 				<data>
@@ -484,10 +484,10 @@
 		</test>
 		<test name='3'>
 			<description>Simple calendar-multiget for VEVENTs</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/schedule/14.xml</filepath>
 				</data>
@@ -502,7 +502,7 @@
 		</test>
 		<test name='4'>
 			<description>Simple calendar-multiget for VEVENTs</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$inboxpath2:/</ruri>
 				<data>
@@ -524,7 +524,7 @@
 		</test>
 		<test name='5'>
 			<description>free-busy-query failure</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -542,7 +542,7 @@
 		</test>
 		<test name='6'>
 			<description>free-busy-query failure</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$inboxpath2:/</ruri>
 				<data>
@@ -560,10 +560,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name="POSTs free busy" ignore='no'>
+	<test-suite name="POSTs free busy">
 		<test name='1'>
 			<description>POST free busy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -590,7 +590,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy - recipients with failure</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -616,7 +616,7 @@
 		</test>
 		<test name='3'>
 			<description>POST free busy - check ATTENDEE presence</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -641,7 +641,7 @@
 		</test>
 		<test name='4'>
 			<description>POST free busy - check ATTENDEE limit</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostacl.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostacl.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostacl.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -225,17 +225,17 @@
 		<request>
 			<method>PROPPATCH</method>
 			<ruri>$inboxpath1:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>text/xml; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/scheduleacl/1.xml</filepath>
 			</data>
 		</request>
 	</start>
 	
-	<test-suite name='Schedule free-busy' ignore='no'>
+	<test-suite name='Schedule free-busy'>
 		<test name='1'>
 			<description>POST free busy</description>
-			<request user="$userid2:" pswd='$pswd2:' print-response='no'>
+			<request user="$userid2:" pswd='$pswd2:'>
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>
@@ -262,7 +262,7 @@
 		<request>
 			<method>PROPPATCH</method>
 			<ruri>$inboxpath1:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>text/xml; charset=utf-8</content-type>
 				<filepath>Resource/CalDAV/scheduleacl/2.xml</filepath>
 			</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/schedulepostmaskuid.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,7 +28,7 @@
 
 	<start/>
 	
-	<test-suite name="Initialize state" ignore='no'>
+	<test-suite name="Initialize state">
 		<test name="1">
 			<description>Blocking event user 2</description>
 			<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
@@ -192,10 +192,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name="POSTs free busy" ignore='no'>
+	<test-suite name="POSTs free busy">
 		<test name='1'>
 			<description>POST free busy - no mask</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -217,7 +217,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy - ok mask</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -239,7 +239,7 @@
 		</test>
 		<test name='3'>
 			<description>POST free busy - bad mask - no organizer</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -261,7 +261,7 @@
 		</test>
 		<test name='4'>
 			<description>POST free busy - bad mask - wrong organizer</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -283,10 +283,10 @@
 		</test>
 	</test-suite>
 		
-	<test-suite name="POSTs free busy - mask no ORGANIZER" ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name="POSTs free busy - mask no ORGANIZER">
+		<test name='1'>
 			<description>POST free busy - ok mask bad organizer</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -308,7 +308,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy - ok mask no organizer</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/scheduleprops.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,8 +27,8 @@
 
 	<start/>
 	
-	<test-suite name='Inbox/Outbox' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Inbox/Outbox'>
+		<test name='1'>
 			<description>PROPFIND inbox/outbox URLs</description>
 			<request>
 				<method>PROPFIND</method>
@@ -54,10 +54,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='free-busy-set' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='free-busy-set'>
+		<test name='1'>
 			<description>PROPFIND inbox</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -77,9 +77,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPPATCH valid calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -95,9 +95,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH invalid calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -113,9 +113,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPPATCH delete it - fails</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -131,9 +131,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PROPPATCH valid calendar - reset it</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -149,16 +149,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Setup some calendars</description>
-			<request  end-delete='yes' print-response="no">
+			<request  end-delete='yes'>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/test1/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request end-delete='yes' print-response="no">
+			<request end-delete='yes'>
 				<method>MKCALENDAR</method>
 				<ruri>$calendarhome1:/test2/</ruri>
 				<verify>
@@ -166,9 +166,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PROPPATCH - valid</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -184,9 +184,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Delete a calendar</description>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/test2/</ruri>
 				<verify>
@@ -194,9 +194,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>PROPPATCH - valid new calendar, invalid existing</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -212,9 +212,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>PROPPATCH - invalid new calendar, invalid existing</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -230,9 +230,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>PROPPATCH valid calendar - reset it</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/servertoserverincoming.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -60,10 +60,10 @@
 		</request>
 	</start>
 	
-	<test-suite name="POST free-busy" ignore='no'>
+	<test-suite name="POST free-busy">
 		<test name='1'>
 			<description>POST free busy one valid user</description>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -84,7 +84,7 @@
 		</test>
 		<test name='2'>
 			<description>POST free busy two valid users</description>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -106,14 +106,14 @@
 		</test>
 	</test-suite>
 
-	<test-suite name="POST invite one user" ignore='no'>
+	<test-suite name="POST invite one user">
 		<test name='1'>
 			<description>POST invite to one valid user</description>
 			<request>
 				<method>DELETEALL</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -132,9 +132,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
@@ -148,14 +148,14 @@
 		</test>
 	</test-suite>
 
-	<test-suite name="POST invite two users" ignore='no'>
+	<test-suite name="POST invite two users">
 		<test name='1'>
 			<description>POST invite to two valid users</description>
 			<request>
 				<method>DELETEALL</method>
 				<ruri>$inboxpath1:/</ruri>
 			</request>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -174,9 +174,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>One item in user01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath1:/</ruri>
 				<verify>
@@ -188,9 +188,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>One item in user02 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:" print-response="no">
+			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>GETNEW</method>
 				<ruri>$inboxpath2:/</ruri>
 				<verify>
@@ -204,10 +204,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name="POST Errors" ignore='no'>
+	<test-suite name="POST Errors">
 		<test name='1'>
 			<description>POST authenticated</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -225,7 +225,7 @@
 		</test>
 		<test name='2'>
 			<description>POST local originator</description>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -243,7 +243,7 @@
 		</test>
 		<test name='3'>
 			<description>POST invalid local recipient</description>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -264,7 +264,7 @@
 		</test>
 		<test name='4'>
 			<description>POST remote recipient</description>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -285,7 +285,7 @@
 		</test>
 		<test name='5'>
 			<description>POST local organizer</description>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>
@@ -303,7 +303,7 @@
 		</test>
 		<test name='6'>
 			<description>POST local attendee reply</description>
-			<request auth='no' print-response='no'>
+			<request auth='no'>
 				<method>POST</method>
 				<ruri>$servertoserver:</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/servertoserveroutgoing.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/servertoserveroutgoing.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/servertoserveroutgoing.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,10 +27,10 @@
 
 	<start/>
 	
-	<test-suite name="POST free-busy" ignore='no'>
+	<test-suite name="POST free-busy">
 		<test name='1'>
 			<description>POST free busy one valid user</description>
-			<request print-response='yes'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -51,10 +51,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name="POST invite" ignore='no'>
+	<test-suite name="POST invite">
 		<test name='1'>
 			<description>POST invite one valid user</description>
-			<request print-response='yes'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-cache.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,8 +37,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='Generate invite' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Generate invite'>
+		<test name='1'>
 			<description>Create</description>
 			<request end-delete="yes">
 				<method>MKCALENDAR</method>
@@ -48,9 +48,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND Home to cache it</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -70,9 +70,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -84,9 +84,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPFIND Home check</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -106,9 +106,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>POST uninvite</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -120,9 +120,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PROPFIND Home check</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -145,9 +145,9 @@
 	</test-suite>
 
 	<test-suite name='Send first reply'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -161,11 +161,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -186,9 +186,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPFIND Home check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -206,10 +206,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/replies/accept/3.xml</filepath>
 				</data>
@@ -230,9 +230,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PROPFIND Home check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -252,9 +252,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Delete shared</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar:/</ruri>
 				<verify>
@@ -262,9 +262,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PROPFIND Home check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -286,10 +286,10 @@
 		</test>
 		<test name='8'>
 			<description>Sharee replies ACCEPTED - need to do this cycle of accept/delete twice to regress properly</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/replies/accept/3.xml</filepath>
 				</data>
@@ -310,9 +310,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>PROPFIND Home check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -332,9 +332,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete shared</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar:/</ruri>
 				<verify>
@@ -342,9 +342,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>PROPFIND Home check</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-calendars.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -42,7 +42,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -53,9 +53,9 @@
 	</start>
 	
 	<test-suite name='Read-write calendar'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -69,11 +69,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -96,10 +96,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/calendars/read-write/3.xml</filepath>
 				</data>
@@ -114,7 +114,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared calendar exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -149,7 +149,7 @@
 		</test>
 		<test name='4a'>
 			<description>Shared calendar exists Depth:1</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -188,7 +188,7 @@
 		</test>
 		<test name='4b'>
 			<description>Shared calendar has invite property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -224,7 +224,7 @@
 		</test>
 		<test name='5'>
 			<description>Original calendar unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -247,7 +247,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharee creates event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/1.ics</ruri>
 				<data>
@@ -261,7 +261,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharer sees event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<verify>
@@ -275,7 +275,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharer changes event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -289,7 +289,7 @@
 		</test>
 		<test name='9'>
 			<description>Sharee sees changed event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/1.ics</ruri>
 				<verify>
@@ -303,7 +303,7 @@
 		</test>
 		<test name='10'>
 			<description>Sharer creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<data>
@@ -317,7 +317,7 @@
 		</test>
 		<test name='11'>
 			<description>Sharee sees new event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/2.ics</ruri>
 				<verify>
@@ -331,7 +331,7 @@
 		</test>
 		<test name='12'>
 			<description>Sharee changes event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/2.ics</ruri>
 				<data>
@@ -345,7 +345,7 @@
 		</test>
 		<test name='13'>
 			<description>Sharer sees changed event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<verify>
@@ -359,10 +359,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Default calendar cannot be shared calendar' ignore='no'>
+	<test-suite name='Default calendar cannot be shared calendar'>
 		<test name='1'>
 			<description>Set property on Inbox</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath2:/</ruri>
 				<data>
@@ -380,7 +380,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify property on inbox</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$inboxpath2:/</ruri>
 				<header>
@@ -402,10 +402,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Change to read-only calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Change to read-only calendar'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -419,11 +419,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -446,10 +446,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/calendars/read-only/3.xml</filepath>
 				</data>
@@ -464,7 +464,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared calendar exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -496,7 +496,7 @@
 		</test>
 		<test name='5'>
 			<description>Create event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/3.ics</ruri>
 				<data>
@@ -514,7 +514,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharer creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/4.ics</ruri>
 				<data>
@@ -528,7 +528,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee sees new event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/4.ics</ruri>
 				<verify>
@@ -542,7 +542,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharee cannot change event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/4.ics</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-create.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,8 +37,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='Create calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Create calendar'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request end-delete="yes">
 				<method>MKCALENDAR</method>
@@ -48,9 +48,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Change the color</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -68,10 +68,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Generate invite' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Generate invite'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -85,11 +85,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -112,10 +112,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Accept' ignore='no'>
+	<test-suite name='Accept'>
 		<test name='1'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -126,10 +126,10 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/replies/accept/3.xml</filepath>
 				</data>
@@ -142,9 +142,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -166,7 +166,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -184,7 +184,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared calendar exists without color</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-direct.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -42,7 +42,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -52,10 +52,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Read-write calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Read-write calendar'>
+		<test name='1'>
 			<description>Add user02 as read write for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -73,7 +73,7 @@
 		</test>
 		<test name='2'>
 			<description>Sharee does direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -87,7 +87,7 @@
 		</test>
 		<test name='3'>
 			<description>Shared calendar exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -120,7 +120,7 @@
 		</test>
 		<test name='4'>
 			<description>Original calendar unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -143,7 +143,7 @@
 		</test>
 		<test name='5'>
 			<description>Sharee creates event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/1.ics</ruri>
 				<data>
@@ -157,7 +157,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharer sees event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<verify>
@@ -171,7 +171,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharer changes event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -185,7 +185,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharee sees changed event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/1.ics</ruri>
 				<verify>
@@ -199,7 +199,7 @@
 		</test>
 		<test name='9'>
 			<description>Sharer creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<data>
@@ -213,7 +213,7 @@
 		</test>
 		<test name='10'>
 			<description>Sharee sees new event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/2.ics</ruri>
 				<verify>
@@ -227,7 +227,7 @@
 		</test>
 		<test name='11'>
 			<description>Sharee changes event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/2.ics</ruri>
 				<data>
@@ -241,7 +241,7 @@
 		</test>
 		<test name='12'>
 			<description>Sharer sees changed event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<verify>
@@ -255,7 +255,7 @@
 		</test>
 		<test name='13'>
 			<description>Sharee does direct share again</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -269,7 +269,7 @@
 		</test>
 		<test name='14'>
 			<description>Shared calendar exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -302,10 +302,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Change to read-only calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Change to read-only calendar'>
+		<test name='1'>
 			<description>Clear user02 as read-write proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -321,9 +321,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Add user02 as read-only for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -341,7 +341,7 @@
 		</test>
 		<test name='3'>
 			<description>Shared calendar exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -373,7 +373,7 @@
 		</test>
 		<test name='4'>
 			<description>Create event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/3.ics</ruri>
 				<data>
@@ -391,7 +391,7 @@
 		</test>
 		<test name='5'>
 			<description>Sharer creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/4.ics</ruri>
 				<data>
@@ -405,7 +405,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharee sees new event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/4.ics</ruri>
 				<verify>
@@ -419,7 +419,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee cannot change event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/4.ics</ruri>
 				<data>
@@ -437,10 +437,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Removal of direct share' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Removal of direct share'>
+		<test name='1'>
 			<description>Remove direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<verify>
@@ -450,7 +450,7 @@
 		</test>
 		<test name='2'>
 			<description>Shared calendar does not exist</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -472,7 +472,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharer calendar does exist</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -494,10 +494,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Direct share not allowed' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Direct share not allowed'>
+		<test name='1'>
 			<description>Clear user02 as read-only proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -515,7 +515,7 @@
 		</test>
 		<test name='2'>
 			<description>Sharee does direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -529,10 +529,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Using non __uids__ path' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Using non __uids__ path'>
+		<test name='1'>
 			<description>Add user02 as read write for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -550,7 +550,7 @@
 		</test>
 		<test name='2'>
 			<description>Sharee does direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhomealt1:/shared/?action=share</ruri>
 				<verify>
@@ -564,7 +564,7 @@
 		</test>
 		<test name='3'>
 			<description>Shared calendar exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>
@@ -597,7 +597,7 @@
 		</test>
 		<test name='4'>
 			<description>Sharee creates event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/9.ics</ruri>
 				<data>
@@ -611,7 +611,7 @@
 		</test>
 		<test name='5'>
 			<description>Sharer sees event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/9.ics</ruri>
 				<verify>
@@ -623,9 +623,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Remove direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<verify>
@@ -633,9 +633,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Clear user02 as read-write proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -653,10 +653,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Calendar color' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Calendar color'>
+		<test name='1'>
 			<description>Add user02 as read write for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -672,9 +672,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Change the color</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhomealt1:/shared/</ruri>
 				<data>
@@ -692,7 +692,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharee does direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarhomealt1:/shared/?action=share</ruri>
 				<verify>
@@ -706,7 +706,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared calendar exists with color</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>
@@ -726,9 +726,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Remove direct share</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<verify>
@@ -736,9 +736,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Clear user02 as read-write proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-dropbox.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -50,9 +50,9 @@
 	</start>
 	
 	<test-suite name='Setup two sharees'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<data>
@@ -66,11 +66,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee 2 notification collection</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath3:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath3:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee 2 replies ACCEPTED</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$calendarhome3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply23.xml</filepath>
 				</data>
@@ -106,11 +106,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee 3 notification collection</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath4:/</ruri>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath4:/</ruri>
 				<verify>
@@ -128,10 +128,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee 3 replies ACCEPTED</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>POST</method>
 				<ruri>$calendarhome4:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply24.xml</filepath>
 				</data>
@@ -161,7 +161,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT by User 2' ignore='no'>
+	<test-suite name='PUT by User 2'>
 		<test name='1'>
 			<description>PUT event by user 2</description>
 			<request user="$userid2:" pswd="$pswd2:">
@@ -190,9 +190,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Attachment exists for User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
 				<header>
@@ -212,9 +212,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Attachment exists for User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
 				<header>
@@ -248,9 +248,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Attachments exists for User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-feature.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -46,7 +46,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for options header tag on calendar</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -62,9 +62,9 @@
 	</test-suite>
 
 	<test-suite name='Allowed modes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Check mode</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -84,9 +84,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>No mode on inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -119,9 +119,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Not shared</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared1/</ruri>
 				<header>
@@ -143,7 +143,7 @@
 		</test>
 		<test name='3'>
 			<description>Upgrade via PROPPATCH</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared1/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-freebusy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,7 +31,7 @@
 			<method>MKCALENDAR</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>POST</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -42,11 +42,11 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>GETNEW</method>
 			<ruri>$notificationpath2:/</ruri>
 			<grabelement>
@@ -58,10 +58,10 @@
 				<variable>$hosturl2:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>POST</method>
 			<ruri>$calendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 			</data>
@@ -70,11 +70,11 @@
 				<variable>$sharedcalendar2:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath3:/</ruri>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>GETNEW</method>
 			<ruri>$notificationpath3:/</ruri>
 			<grabelement>
@@ -86,10 +86,10 @@
 				<variable>$hosturl3:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>POST</method>
 			<ruri>$calendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3.xml</filepath>
 			</data>
@@ -98,7 +98,7 @@
 				<variable>$sharedcalendar3:</variable>
 			</grabelement>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -106,7 +106,7 @@
 				<filepath>Resource/Common/PROPPATCH/calendar-transp-opaque.xml</filepath>
 			</data>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>PROPPATCH</method>
 			<ruri>$sharedcalendar2:/</ruri>
 			<data>
@@ -114,7 +114,7 @@
 				<filepath>Resource/Common/PROPPATCH/calendar-transp-opaque.xml</filepath>
 			</data>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>PROPPATCH</method>
 			<ruri>$sharedcalendar3:/</ruri>
 			<data>
@@ -124,24 +124,24 @@
 		</request>
 	</start>
 	
-	<test-suite name='Initial event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Initial event'>
+		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/1.ics</filepath>
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 freebusy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/3.ics</filepath>
 				</data>
@@ -180,12 +180,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 freebusy</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/4.ics</filepath>
 				</data>
@@ -224,12 +224,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User03 freebusy</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/5.ics</filepath>
 				</data>
@@ -270,24 +270,24 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Changed event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Changed event'>
+		<test name='1'>
 			<description>User02 store to shared</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/2.ics</filepath>
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 freebusy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/3.ics</filepath>
 				</data>
@@ -322,12 +322,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 freebusy</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/4.ics</filepath>
 				</data>
@@ -362,12 +362,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User03 freebusy</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/freebusy/5.ics</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-invites.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -59,9 +59,9 @@
 	</start>
 	
 	<test-suite name='Send new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -75,11 +75,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -98,7 +98,7 @@
 		</test>
 		<test name='3'>
 			<description>Notification type property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -121,9 +121,9 @@
 	</test-suite>
 	
 	<test-suite name='Update new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -137,11 +137,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -160,7 +160,7 @@
 		</test>
 		<test name='3'>
 			<description>Notification type property</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -183,9 +183,9 @@
 	</test-suite>
 	
 	<test-suite name='Uninvite new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -199,7 +199,7 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
@@ -222,9 +222,9 @@
 	</test-suite>
 	
 	<test-suite name='Attempt broken invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -246,7 +246,7 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
@@ -269,9 +269,9 @@
 	</test-suite>
 	
 	<test-suite name='Delete new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -285,7 +285,7 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
@@ -305,9 +305,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>DELETE collection</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>
@@ -317,7 +317,7 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
@@ -340,7 +340,7 @@
 	</test-suite>
 	
 	<test-suite name='Uninvite invalid invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request end-delete="yes">
 				<method>MKCALENDAR</method>
@@ -350,9 +350,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST valid invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -364,9 +364,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single invalid uninvitate</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -378,9 +378,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST invalid and valid uninvitate</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -400,9 +400,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>DELETE collection</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>
@@ -413,9 +413,9 @@
 	</test-suite>
 
 	<test-suite name='Double invites'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation #2</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -429,11 +429,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -454,13 +454,13 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST invitation #3</description>
-			<request print-response='no'>
+			<request>
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared3/</ruri>
 				<data>
@@ -474,11 +474,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 2</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -497,10 +497,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED #2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/invites/double/5.xml</filepath>
 				</data>
@@ -523,7 +523,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharee deletes shared calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar2:/</ruri>
 				<verify>
@@ -531,9 +531,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Remove invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -545,9 +545,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Remove invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared3/</ruri>
 				<data>
@@ -562,9 +562,9 @@
 	</test-suite>
 	
 	<test-suite name='Self invite error'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation #2</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-moves.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,7 +31,7 @@
 			<method>MKCALENDAR</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>POST</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -42,11 +42,11 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>GETNEW</method>
 			<ruri>$notificationpath2:/</ruri>
 			<grabelement>
@@ -58,10 +58,10 @@
 				<variable>$hosturl2:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>POST</method>
 			<ruri>$calendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 			</data>
@@ -72,10 +72,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='OK event to shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='OK event to shared calendar'>
+		<test name='1'>
 			<description>User02 store to personal calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarpath2:/1.ics</ruri>
 				<data>
@@ -87,9 +87,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 moves event to shared calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>MOVE</method>
 				<ruri>$calendarpath2:/1.ics</ruri>
 				<header>
@@ -101,9 +101,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 sees event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
 				<verify>
@@ -115,9 +115,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User01 sees event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<verify>
@@ -132,10 +132,10 @@
 	</test-suite>
 
 	
-	<test-suite name='Bad event to shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Bad event to shared calendar'>
+		<test name='1'>
 			<description>User02 store to personal calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" end-delete="yes" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:" end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath2:/2.ics</ruri>
 				<data>
@@ -147,9 +147,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 moves event to shared calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>MOVE</method>
 				<ruri>$calendarpath2:/2.ics</ruri>
 				<header>
@@ -167,10 +167,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='OK event from shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='OK event from shared calendar'>
+		<test name='1'>
 			<description>User01 store to shared calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/3.ics</ruri>
 				<data>
@@ -182,9 +182,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 moves event from shared calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>MOVE</method>
 				<ruri>$sharedcalendar2:/3.ics</ruri>
 				<header>
@@ -196,9 +196,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 sees event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$calendarpath2:/3.ics</ruri>
 				<verify>
@@ -209,7 +209,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$calendarpath2:/3.ics</ruri>
 				<verify>
@@ -217,9 +217,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User01 sees no event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/3.ics</ruri>
 				<verify>
@@ -234,10 +234,10 @@
 	</test-suite>
 
 	
-	<test-suite name='Bad event to shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Bad event to shared calendar'>
+		<test name='1'>
 			<description>User01 store to shared calendar</description>
-			<request end-delete="yes" print-response="no">
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/4.ics</ruri>
 				<data>
@@ -249,9 +249,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 moves event from shared calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>MOVE</method>
 				<ruri>$sharedcalendar2:/4.ics</ruri>
 				<header>
@@ -269,10 +269,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='OK owner event to shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='OK owner event to shared calendar'>
+		<test name='1'>
 			<description>User01 store to personal calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<data>
@@ -284,9 +284,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 moves event to shared calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/5.ics</ruri>
 				<header>
@@ -298,9 +298,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 sees event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/5.ics</ruri>
 				<verify>
@@ -312,9 +312,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User01 sees event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/5.ics</ruri>
 				<verify>
@@ -325,7 +325,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/shared/5.ics</ruri>
 				<verify>
@@ -336,10 +336,10 @@
 	</test-suite>
 
 	
-	<test-suite name='OK owner event with organizer to shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='OK owner event with organizer to shared calendar'>
+		<test name='1'>
 			<description>User01 store to personal calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<data>
@@ -351,9 +351,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 moves event to shared calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarpath1:/6.ics</ruri>
 				<header>
@@ -365,9 +365,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 sees event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/6.ics</ruri>
 				<verify>
@@ -379,9 +379,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User01 sees event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/6.ics</ruri>
 				<verify>
@@ -392,7 +392,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/shared/6.ics</ruri>
 				<verify>
@@ -402,10 +402,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='OK owner event from shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='OK owner event from shared calendar'>
+		<test name='1'>
 			<description>User01 store to shared calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/7.ics</ruri>
 				<data>
@@ -417,9 +417,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 moves event from shared calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/shared/7.ics</ruri>
 				<header>
@@ -431,9 +431,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 does not see event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/7.ics</ruri>
 				<verify>
@@ -445,9 +445,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User01 sees event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/7.ics</ruri>
 				<verify>
@@ -458,7 +458,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/7.ics</ruri>
 				<verify>
@@ -469,10 +469,10 @@
 	</test-suite>
 
 	
-	<test-suite name='OK owner event with organizer from shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='OK owner event with organizer from shared calendar'>
+		<test name='1'>
 			<description>User01 store to shared calendar</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/8.ics</ruri>
 				<data>
@@ -484,9 +484,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 moves event from shared calendar</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$calendarhome1:/shared/8.ics</ruri>
 				<header>
@@ -498,9 +498,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 does not see event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/8.ics</ruri>
 				<verify>
@@ -512,9 +512,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User01 sees event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/8.ics</ruri>
 				<verify>
@@ -525,7 +525,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/8.ics</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-multiple.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -52,9 +52,9 @@
 	</start>
 	
 	<test-suite name='Send new invite #1'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial collection count</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -71,9 +71,9 @@
 				<grabcount>$calendarhome2count:</grabcount>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared1/</ruri>
 				<data>
@@ -87,11 +87,11 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -105,10 +105,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/multiple/2.xml</filepath>
 				</data>
@@ -121,9 +121,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One more calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -143,9 +143,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One more calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar1:/</ruri>
 				<header>
@@ -168,9 +168,9 @@
 	</test-suite>
 	
 	<test-suite name='Send new invite #2'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial collection count</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -187,9 +187,9 @@
 				<grabcount>$calendarhome2count:</grabcount>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -203,11 +203,11 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 2</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -221,10 +221,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/multiple/3.xml</filepath>
 				</data>
@@ -237,9 +237,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One more calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -259,9 +259,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One more calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>
@@ -284,9 +284,9 @@
 	</test-suite>
 	
 	<test-suite name='Uninvite #2'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial collection count</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -303,9 +303,9 @@
 				<grabcount>$calendarhome2count:</grabcount>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -319,7 +319,7 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
@@ -339,9 +339,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One less calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -361,9 +361,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One less calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>
@@ -383,9 +383,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Existing calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-notification-sync.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -43,7 +43,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -53,10 +53,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='support-report-set' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='support-report-set'>
+		<test name='1'>
 			<description>On notification collection</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$notificationpath1:/</ruri>
 				<header>
@@ -78,10 +78,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='initial tokens - depth 1' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='initial tokens - depth 1'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$notificationpath1:/</ruri>
 				<header>
@@ -105,9 +105,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
@@ -133,10 +133,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Read-write calendar - depth 1' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Read-write calendar - depth 1'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -148,20 +148,20 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -184,21 +184,21 @@
 		</test>
 		<test name='3'>
 			<description>Remove notification</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>new resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -221,13 +221,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='initial tokens - depth infinity' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='initial tokens - depth infinity'>
+		<test name='1'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -259,12 +259,12 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - grab token</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -301,9 +301,9 @@
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -315,13 +315,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -342,14 +342,14 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -368,21 +368,21 @@
 		</test>
 		<test name='3'>
 			<description>Remove notification</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>deleted resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -405,10 +405,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/5.xml</filepath>
 				</data>
@@ -425,16 +425,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6-' ignore='no'>
+		<test name='6-'>
 			<description>bad sync token</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -447,16 +447,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>new calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
 				</data>
@@ -507,7 +507,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee removes calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<verify>
@@ -515,16 +515,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>removed calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -551,9 +551,9 @@
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -565,13 +565,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -592,14 +592,14 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -618,21 +618,21 @@
 		</test>
 		<test name='3'>
 			<description>Remove notification</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>deleted resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -655,10 +655,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/5.xml</filepath>
 				</data>
@@ -675,16 +675,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6-' ignore='no'>
+		<test name='6-'>
 			<description>bad sync token</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -697,16 +697,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>new calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
 				</data>
@@ -755,9 +755,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -768,14 +768,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
 				</data>
@@ -787,21 +787,21 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>removed calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -826,16 +826,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>no calendar change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
 				</data>
@@ -848,16 +848,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>no calendar change</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/12.xml</filepath>
 				</data>
@@ -886,9 +886,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -900,13 +900,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>new resource</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<grabelement>
@@ -917,18 +917,18 @@
 		</test>
 		<test name='4'>
 			<description>Remove notification</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -943,10 +943,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/5.xml</filepath>
 				</data>
@@ -963,16 +963,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6-' ignore='no'>
+		<test name='6-'>
 			<description>bad sync token</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -985,16 +985,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>new calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
 				</data>
@@ -1045,16 +1045,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Grab sharer's sync token'</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/2.xml</filepath>
 				</data>
@@ -1081,16 +1081,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
 				</data>
@@ -1108,16 +1108,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Sharee change</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -1153,16 +1153,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
 				</data>
@@ -1180,16 +1180,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Sharee change</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -1221,16 +1221,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
 				</data>
@@ -1251,16 +1251,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>Sharee change</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -1295,16 +1295,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/9.xml</filepath>
 				</data>
@@ -1325,16 +1325,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='19'>
 			<description>Sharee change</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -1361,7 +1361,7 @@
 		</test>
 		<test name='20'>
 			<description>Sharee removes calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<verify>
@@ -1369,16 +1369,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='21'>
 			<description>removed calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/notification-sync/4.xml</filepath>
 				</data>
@@ -1401,20 +1401,20 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Response cache' ignore='no'>
+	<test-suite name='Response cache'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PROPFIND of current sync-token - direct</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1427,16 +1427,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND of home</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1449,16 +1449,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPFIND of home again - to cache it</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1471,9 +1471,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -1485,16 +1485,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PROPFIND of home - token changed</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1507,16 +1507,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PROPFIND of new sync-token - direct</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$notificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1529,16 +1529,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PROPFIND of home</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1555,16 +1555,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>PROPFIND of home again - to cache it</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1583,21 +1583,21 @@
 		</test>
 		<test name='9'>
 			<description>Remove notification</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>PROPFIND of home - token changed</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-data.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,7 +31,7 @@
 			<method>MKCALENDAR</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>POST</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -42,11 +42,11 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath2:/</ruri>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>GETNEW</method>
 			<ruri>$notificationpath2:/</ruri>
 			<grabelement>
@@ -58,10 +58,10 @@
 				<variable>$hosturl2:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>POST</method>
 			<ruri>$calendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 			</data>
@@ -70,11 +70,11 @@
 				<variable>$sharedcalendar2:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath3:/</ruri>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>GETNEW</method>
 			<ruri>$notificationpath3:/</ruri>
 			<grabelement>
@@ -86,10 +86,10 @@
 				<variable>$hosturl3:</variable>
 			</grabelement>
 		</request>
-		<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+		<request user="$userid3:" pswd="$pswd3:">
 			<method>POST</method>
 			<ruri>$calendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3.xml</filepath>
 			</data>
@@ -100,10 +100,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Initial event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Initial event'>
+		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -112,9 +112,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 sees event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
 				<verify>
@@ -126,9 +126,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/1.ics</ruri>
 				<verify>
@@ -142,10 +142,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User01 changed event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User01 changed event'>
+		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -154,9 +154,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 sees event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
 				<verify>
@@ -168,9 +168,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/1.ics</ruri>
 				<verify>
@@ -184,10 +184,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User02 changed event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User02 changed event'>
+		<test name='1'>
 			<description>User02 store to shared</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
 				<data>
@@ -196,9 +196,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 sees event</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<verify>
@@ -210,9 +210,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/1.ics</ruri>
 				<verify>
@@ -226,10 +226,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Different freebusy' ignore='no'>
+	<test-suite name='Different freebusy'>
 		<test name='1'>
 			<description>Set properties on new calendars</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -244,7 +244,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<data>
@@ -259,7 +259,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar3:/</ruri>
 				<data>
@@ -275,9 +275,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 freebusy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -315,9 +315,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 freebusy</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>
@@ -355,9 +355,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User03 freebusy</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
 				<data>
@@ -397,10 +397,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User01 complex recurring store' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User01 complex recurring store'>
+		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<data>
@@ -409,9 +409,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 sees event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/2.ics</ruri>
 				<verify>
@@ -423,9 +423,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/2.ics</ruri>
 				<verify>
@@ -439,10 +439,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User02 complex recurring store' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User02 complex recurring store'>
+		<test name='1'>
 			<description>User02 store to shared</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/2.ics</ruri>
 				<data>
@@ -451,9 +451,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 sees event</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<verify>
@@ -465,9 +465,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/2.ics</ruri>
 				<verify>
@@ -481,10 +481,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Complex freebusy' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Complex freebusy'>
+		<test name='1'>
 			<description>User01 freebusy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -535,9 +535,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 freebusy</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
 				<data>
@@ -588,9 +588,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 freebusy</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
 				<data>
@@ -643,10 +643,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Prevent per-user data injection' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Prevent per-user data injection'>
+		<test name='1'>
 			<description>User01 new event with injected per-user data</description>
-			<request user="$userid1:" pswd="$pswd1:" end-delete="yes" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:" end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -662,9 +662,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 new event with valid data</description>
-			<request user="$userid1:" pswd="$pswd1:" end-delete="yes" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:" end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -676,9 +676,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User01 existing event with injected per-user data</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-peruser-properties.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -45,9 +45,9 @@
 	</start>
 	
 	<test-suite name='Read-write calendar'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -61,11 +61,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/peruser-properties/read-write/3.xml</filepath>
 				</data>
@@ -106,7 +106,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared calendar exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -138,10 +138,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='prop patches - non-global' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches - non-global'>
+		<test name='1'>
 			<description>PROPPATCH of displayname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -156,7 +156,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -176,9 +176,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND of shared displayname</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -198,9 +198,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH of displayname</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<data>
@@ -215,7 +215,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -235,9 +235,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPFIND of shared displayname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -259,10 +259,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='prop patches - shadowable' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches - shadowable'>
+		<test name='1'>
 			<description>PROPPATCH of calendar-description</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -277,7 +277,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -297,9 +297,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND of shared calendar-description</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -319,9 +319,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH of calendar-description</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<data>
@@ -336,7 +336,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -356,9 +356,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPFIND of shared calendar-description</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-proxies.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -139,7 +139,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/setup/3.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-quota.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -51,9 +51,9 @@
 	</start>
 	
 	<test-suite name='Setup two sharees'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<data>
@@ -67,11 +67,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee 2 notification collection</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath3:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath3:/</ruri>
 				<verify>
@@ -89,10 +89,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee 2 replies ACCEPTED</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$calendarhome3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply23.xml</filepath>
 				</data>
@@ -107,11 +107,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee 3 notification collection</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath4:/</ruri>
 			</request>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath4:/</ruri>
 				<verify>
@@ -129,10 +129,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee 3 replies ACCEPTED</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>POST</method>
 				<ruri>$calendarhome4:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply24.xml</filepath>
 				</data>
@@ -162,10 +162,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Empty quota for all' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Empty quota for all'>
+		<test name='1'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -186,9 +186,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome3:/</ruri>
 				<header>
@@ -209,9 +209,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome4:/</ruri>
 				<header>
@@ -232,9 +232,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<header>
@@ -255,9 +255,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar3:/</ruri>
 				<header>
@@ -278,9 +278,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar4:/</ruri>
 				<header>
@@ -303,7 +303,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT by User 2' ignore='no'>
+	<test-suite name='PUT by User 2'>
 		<test name='1'>
 			<description>PUT by user 2</description>
 			<request user="$userid2:" pswd="$pswd2:">
@@ -318,9 +318,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User 1</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -341,9 +341,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome3:/</ruri>
 				<header>
@@ -364,9 +364,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome4:/</ruri>
 				<header>
@@ -387,9 +387,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<header>
@@ -410,9 +410,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar3:/</ruri>
 				<header>
@@ -433,9 +433,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar4:/</ruri>
 				<header>
@@ -458,7 +458,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT by User 3' ignore='no'>
+	<test-suite name='PUT by User 3'>
 		<test name='1'>
 			<description>PUT by user 3</description>
 			<request user="$userid3:" pswd="$pswd3:" >
@@ -473,9 +473,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -496,9 +496,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome3:/</ruri>
 				<header>
@@ -519,9 +519,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome4:/</ruri>
 				<header>
@@ -542,9 +542,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<header>
@@ -565,9 +565,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar3:/</ruri>
 				<header>
@@ -588,9 +588,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar4:/</ruri>
 				<header>
@@ -613,7 +613,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='DELETE by User 3' ignore='no'>
+	<test-suite name='DELETE by User 3'>
 		<test name='1'>
 			<description>DELETE by user 3</description>
 			<request user="$userid3:" pswd="$pswd3:">
@@ -624,9 +624,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -647,9 +647,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome3:/</ruri>
 				<header>
@@ -670,9 +670,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome4:/</ruri>
 				<header>
@@ -693,9 +693,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<header>
@@ -716,9 +716,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar3:/</ruri>
 				<header>
@@ -739,9 +739,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar4:/</ruri>
 				<header>
@@ -764,7 +764,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='DELETE by User 2' ignore='no'>
+	<test-suite name='DELETE by User 2'>
 		<test name='1'>
 			<description>DELETE by user 2</description>
 			<request user="$userid2:" pswd="$pswd2:">
@@ -775,9 +775,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -798,9 +798,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome3:/</ruri>
 				<header>
@@ -821,9 +821,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome4:/</ruri>
 				<header>
@@ -844,9 +844,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<header>
@@ -867,9 +867,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>User 3</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar3:/</ruri>
 				<header>
@@ -890,9 +890,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>User 4</description>
-			<request user="$userid4:" pswd="$pswd4:" print-response='no'>
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar4:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-replies.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -45,9 +45,9 @@
 	</start>
 	
 	<test-suite name='Send first reply'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -61,11 +61,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/replies/accept/3.xml</filepath>
 				</data>
@@ -112,9 +112,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -144,7 +144,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -160,9 +160,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check sharee calendar displyname/shared-url</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -183,9 +183,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check sharer calendar displyname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -210,10 +210,10 @@
 	<test-suite name='Update reply'>
 		<test name='1'>
 			<description>Sharee replies DECLINED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/replies/decline/1.xml</filepath>
 				</data>
@@ -222,9 +222,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check declined status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -254,7 +254,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-sync.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-sync.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -43,7 +43,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -54,9 +54,9 @@
 	</start>
 	
 	<test-suite name='Read-write calendar'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial sync tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -71,7 +71,7 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -86,7 +86,7 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -101,7 +101,7 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<data>
@@ -116,7 +116,7 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<data>
@@ -132,9 +132,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -148,11 +148,11 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -179,10 +179,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 				</data>
@@ -200,12 +200,12 @@
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -222,10 +222,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -246,10 +246,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -264,10 +264,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -284,10 +284,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -299,10 +299,10 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -323,10 +323,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
 				</data>
@@ -341,7 +341,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharee creates event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$calendarhome2:/$sharedcalendar:/1.ics</ruri>
 				<data>
@@ -353,12 +353,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -374,10 +374,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -394,10 +394,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -413,10 +413,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -432,10 +432,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -452,10 +452,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -474,7 +474,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharer changes event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -486,12 +486,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -507,10 +507,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -527,10 +527,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -546,10 +546,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -565,10 +565,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -585,10 +585,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -607,7 +607,7 @@
 		</test>
 		<test name='10'>
 			<description>Sharee deletes event</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$calendarhome2:/$sharedcalendar:/1.ics</ruri>
 				<verify>
@@ -615,12 +615,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -636,10 +636,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -659,10 +659,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -678,10 +678,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -697,10 +697,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -720,10 +720,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -742,7 +742,7 @@
 		</test>
 		<test name='12'>
 			<description>Sharer unshares</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -754,12 +754,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -775,10 +775,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -794,10 +794,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -809,10 +809,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -832,10 +832,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -859,10 +859,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -878,18 +878,18 @@
 	</test-suite>
 	
 
-	<test-suite name='calendar webdav property change - home depth:infinity' ignore='no'>
+	<test-suite name='calendar webdav property change - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation and accept</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath1:/</ruri>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -900,11 +900,11 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -928,10 +928,10 @@
 					<variable>$hosturl2:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 				</data>
@@ -949,9 +949,9 @@
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -979,9 +979,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>initial query - grab token for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -1009,7 +1009,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Change a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1023,16 +1023,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1056,16 +1056,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1089,7 +1089,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Remove a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1103,16 +1103,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1136,16 +1136,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1169,7 +1169,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Change a property by user 2</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
@@ -1183,16 +1183,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1216,16 +1216,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1249,7 +1249,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Remove a property by user 1</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
@@ -1263,16 +1263,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1296,16 +1296,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1331,7 +1331,7 @@
 		</test>
 		<test name='16'>
 			<description>Sharer unshares</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -1345,18 +1345,18 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='calendar webdav property change - home depth:1' ignore='no'>
+	<test-suite name='calendar webdav property change - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation and accept</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
 				<ruri>$notificationpath1:/</ruri>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -1367,11 +1367,11 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -1395,10 +1395,10 @@
 					<variable>$hosturl2:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 				</data>
@@ -1416,9 +1416,9 @@
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1446,9 +1446,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>initial query - grab token for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
@@ -1476,7 +1476,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Change a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1490,16 +1490,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1523,16 +1523,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1556,7 +1556,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Remove a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1570,16 +1570,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1603,16 +1603,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1636,7 +1636,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Change a property by user 2</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
@@ -1650,16 +1650,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1683,16 +1683,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1716,7 +1716,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Remove a property by user 1</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
@@ -1730,16 +1730,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1763,16 +1763,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Sync for user 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$calendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1798,7 +1798,7 @@
 		</test>
 		<test name='16'>
 			<description>Sharer unshares</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-traveltime.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-traveltime.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-traveltime.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -62,7 +62,7 @@
 		<request user="$userid2:" pswd="$pswd2:">
 			<method>POST</method>
 			<ruri>$calendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 			</data>
@@ -90,7 +90,7 @@
 		<request user="$userid3:" pswd="$pswd3:">
 			<method>POST</method>
 			<ruri>$calendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3.xml</filepath>
 			</data>
@@ -131,7 +131,7 @@
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/starttime/1.ics</filepath>
 				</data>
@@ -142,7 +142,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/3.ics</filepath>
 				</data>
@@ -186,7 +186,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/4.ics</filepath>
 				</data>
@@ -230,7 +230,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/5.ics</filepath>
 				</data>
@@ -274,7 +274,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/starttime/2.ics</filepath>
 				</data>
@@ -285,7 +285,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/3.ics</filepath>
 				</data>
@@ -329,7 +329,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/4.ics</filepath>
 				</data>
@@ -373,7 +373,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/5.ics</filepath>
 				</data>
@@ -427,7 +427,7 @@
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/endtime/1.ics</filepath>
 				</data>
@@ -438,7 +438,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/3.ics</filepath>
 				</data>
@@ -482,7 +482,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/4.ics</filepath>
 				</data>
@@ -526,7 +526,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/5.ics</filepath>
 				</data>
@@ -570,7 +570,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/endtime/2.ics</filepath>
 				</data>
@@ -581,7 +581,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/3.ics</filepath>
 				</data>
@@ -625,7 +625,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/4.ics</filepath>
 				</data>
@@ -669,7 +669,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/5.ics</filepath>
 				</data>
@@ -723,7 +723,7 @@
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/bothtime/1.ics</filepath>
 				</data>
@@ -734,7 +734,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/3.ics</filepath>
 				</data>
@@ -778,7 +778,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/4.ics</filepath>
 				</data>
@@ -822,7 +822,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/5.ics</filepath>
 				</data>
@@ -866,7 +866,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/bothtime/2.ics</filepath>
 				</data>
@@ -877,7 +877,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/3.ics</filepath>
 				</data>
@@ -921,7 +921,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$outboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/4.ics</filepath>
 				</data>
@@ -965,7 +965,7 @@
 			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$outboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/traveltime/5.ics</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-unshare.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -44,10 +44,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Set up share' ignore="no">
-		<test name='1' ignore='no'>
+	<test-suite name='Set up share'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -61,11 +61,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -112,9 +112,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -144,7 +144,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -162,10 +162,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Delete' ignore="no">
+	<test-suite name='Delete'>
 		<test name='1'>
 			<description>Sharer adds event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -177,9 +177,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Sharee deletes shared calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -191,9 +191,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>No more shared calendar</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -213,9 +213,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Sharer still has calendar data</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -237,10 +237,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Reshare after sharee DELETE shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Reshare after sharee DELETE shared calendar'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -254,11 +254,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -281,10 +281,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -305,9 +305,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -337,7 +337,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -356,10 +356,10 @@
 	</test-suite>
 
 
-	<test-suite name='Invite, display name change, uninvite' ignore="no">
-		<test name='1' ignore='no'>
+	<test-suite name='Invite, display name change, uninvite'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -373,11 +373,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath3:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath3:/</ruri>
 				<verify>
@@ -400,10 +400,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$calendarhome3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/sharing/unshare/shareruninvite/3.xml</filepath>
 				</data>
@@ -426,7 +426,7 @@
 		</test>
 		<test name='4'>
 			<description>Sharee changes name</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>PROPPATCH</method>
 				<ruri>$shareecalendar:/</ruri>
 				<data>
@@ -442,9 +442,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>POST uninvitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -458,11 +458,11 @@
 		</test>
 		<test name='6'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath3:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath3:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sharing-webcal.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -46,9 +46,9 @@
 	</start>
 	
 	<test-suite name='Setup two sharees'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -62,11 +62,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee 2 notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -84,10 +84,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee 2 replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 				</data>
@@ -102,11 +102,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee 3 notification collection</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath3:/</ruri>
 			</request>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath3:/</ruri>
 				<verify>
@@ -124,10 +124,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee 3 replies ACCEPTED</description>
-			<request user="$userid3:" pswd="$pswd3:" print-response='no'>
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$calendarhome3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply3.xml</filepath>
 				</data>
@@ -377,7 +377,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>
@@ -394,7 +394,7 @@
 		</test>
 		<test name='2'>
 			<description>GET on calendar collection after sharee PUT - 2nd time from cache</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/sync-report.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -67,10 +67,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='support-report-set/sync-token property' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='support-report-set/sync-token property'>
+		<test name='1'>
 			<description>Not on calendars</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendars:/</ruri>
 				<header>
@@ -101,9 +101,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>On calendar-home</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -162,7 +162,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>On calendar</description>
 			<request>
 				<method>PROPFIND</method>
@@ -193,7 +193,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>On inbox</description>
 			<request>
 				<method>PROPFIND</method>
@@ -228,7 +228,7 @@
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -242,13 +242,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='simple reports - sync-level' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - sync-level'>
+		<test name='1'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:1, depth:0</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -304,12 +304,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:1, depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -365,12 +365,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:1, depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -426,12 +426,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:infinity, depth:0</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -495,12 +495,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:infinity, depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -564,12 +564,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:infinity, depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -633,9 +633,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>sync-level:1, depth:0</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -656,12 +656,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:1, depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -682,12 +682,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:1, depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -708,12 +708,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:infinity, depth:0</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -734,12 +734,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:infinity, depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -760,12 +760,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>sync-level:infinity, depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -786,9 +786,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Bad sync-level</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -810,10 +810,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - empty token - no props' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - empty token - no props'>
+		<test name='1'>
 			<description>initial query - calendar collection depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -834,12 +834,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -895,12 +895,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -964,7 +964,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>add new resource</description>
 			<request>
 				<method>PUT</method>
@@ -978,9 +978,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>new resource - calendar collection depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -1002,12 +1002,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>new resource - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1063,12 +1063,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>new resource - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1134,7 +1134,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>remove new resource</description>
 			<request>
 				<method>DELETE</method>
@@ -1144,9 +1144,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>		
+		<test name='9'>		
 			<description>remove new resource - calendar collection depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -1167,12 +1167,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>remove new resource - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1228,12 +1228,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>remove new resource - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1297,7 +1297,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -1311,9 +1311,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>changed resource - calendar collection depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -1334,12 +1334,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>changed resource - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1395,12 +1395,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>changed resource - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1466,10 +1466,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - no props - calendar depth:1' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - diff token - no props - calendar depth:1'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -1494,7 +1494,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -1507,14 +1507,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -1531,7 +1531,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -1540,14 +1540,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -1560,16 +1560,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/4.xml</filepath>
 				</data>
@@ -1586,7 +1586,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -1599,7 +1599,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
@@ -1623,16 +1623,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -1647,10 +1647,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - empty token - props' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - empty token - props'>
+		<test name='1'>
 			<description>initial query</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
@@ -1679,7 +1679,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -1692,7 +1692,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
@@ -1722,7 +1722,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource new resource</description>
 			<request>
 				<method>DELETE</method>
@@ -1731,7 +1731,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
@@ -1760,7 +1760,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -1773,7 +1773,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
@@ -1804,10 +1804,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - props' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - diff token - props'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
@@ -1840,7 +1840,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -1853,14 +1853,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/6.xml</filepath>
 				</data>
@@ -1885,7 +1885,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -1894,14 +1894,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/6.xml</filepath>
 				</data>
@@ -1914,16 +1914,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/7.xml</filepath>
 				</data>
@@ -1943,7 +1943,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -1956,7 +1956,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
@@ -1988,16 +1988,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/6.xml</filepath>
 				</data>
@@ -2020,17 +2020,17 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - no props - home depth:infinity' ignore='no'>
+	<test-suite name='simple reports - diff token - no props - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initialize</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 			</request>
@@ -2075,9 +2075,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -2145,7 +2145,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -2158,14 +2158,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -2183,7 +2183,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -2192,14 +2192,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -2216,16 +2216,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/4.xml</filepath>
 				</data>
@@ -2246,7 +2246,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -2259,7 +2259,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -2284,16 +2284,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -2308,13 +2308,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - props - home depth:infinity' ignore='no'>
+	<test-suite name='simple reports - diff token - props - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -2397,7 +2397,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -2410,14 +2410,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/6.xml</filepath>
 				</data>
@@ -2443,7 +2443,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -2452,14 +2452,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/6.xml</filepath>
 				</data>
@@ -2476,16 +2476,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/7.xml</filepath>
 				</data>
@@ -2513,7 +2513,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -2526,7 +2526,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -2559,16 +2559,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/6.xml</filepath>
 				</data>
@@ -2591,13 +2591,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - delete/create calendar - home depth:infinity' ignore='no'>
+	<test-suite name='simple reports - diff token - delete/create calendar - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -2665,7 +2665,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>remove resource then calendar</description>
 			<request>
 				<method>DELETE</method>
@@ -2681,14 +2681,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -2705,7 +2705,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>add calendar - test last sync</description>
 			<request>
 				<method>MKCALENDAR</method>
@@ -2714,14 +2714,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/4.xml</filepath>
 				</data>
@@ -2734,16 +2734,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>add calendar - test previous sync</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -2758,17 +2758,17 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - no props - home depth:1' ignore='no'>
+	<test-suite name='simple reports - diff token - no props - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initialize</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/synccalendar1/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/synccalendar2/</ruri>
 			</request>
@@ -2813,9 +2813,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -2875,7 +2875,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -2888,14 +2888,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -2912,7 +2912,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -2921,14 +2921,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -2941,16 +2941,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/13.xml</filepath>
 				</data>
@@ -2967,7 +2967,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -2980,7 +2980,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -3004,16 +3004,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -3028,13 +3028,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - props - home depth:1' ignore='no'>
+	<test-suite name='simple reports - diff token - props - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -3109,7 +3109,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -3122,14 +3122,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/15.xml</filepath>
 				</data>
@@ -3154,7 +3154,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -3163,14 +3163,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/15.xml</filepath>
 				</data>
@@ -3183,16 +3183,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/16.xml</filepath>
 				</data>
@@ -3216,7 +3216,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -3229,7 +3229,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -3261,16 +3261,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/15.xml</filepath>
 				</data>
@@ -3293,13 +3293,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - delete/create calendar - home depth:1' ignore='no'>
+	<test-suite name='simple reports - diff token - delete/create calendar - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -3359,7 +3359,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>remove resource then calendar</description>
 			<request>
 				<method>DELETE</method>
@@ -3375,14 +3375,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -3399,7 +3399,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>add calendar - test last sync</description>
 			<request>
 				<method>MKCALENDAR</method>
@@ -3408,14 +3408,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/13.xml</filepath>
 				</data>
@@ -3428,16 +3428,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>add calendar - test previous sync</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -3452,10 +3452,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - empty inbox' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - empty inbox'>
+		<test name='1'>
 			<description>initial query</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$inboxpath1:/</ruri>
 				<header>
@@ -3476,10 +3476,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - valid token' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - valid token'>
+		<test name='1'>
 			<description>initial query</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<header>
@@ -3501,13 +3501,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='calendar webdav property change - home depth:infinity' ignore='no'>
+	<test-suite name='calendar webdav property change - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -3571,7 +3571,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Change a property</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -3584,14 +3584,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -3615,7 +3615,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Remove a property</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -3628,14 +3628,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/3.xml</filepath>
 				</data>
@@ -3661,13 +3661,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='calendar webdav property change - home depth:1' ignore='no'>
+	<test-suite name='calendar webdav property change - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -3727,7 +3727,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Change a property</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -3740,14 +3740,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -3771,7 +3771,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Remove a property</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -3784,14 +3784,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -3818,13 +3818,13 @@
 	</test-suite>
 
 
-	<test-suite name='default calendar property change - home depth:1' ignore='no'>
+	<test-suite name='default calendar property change - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -3884,9 +3884,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Change property on Inbox</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -3901,14 +3901,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -3932,9 +3932,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Reset the property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$inboxpath1:/</ruri>
 				<data>
@@ -3949,14 +3949,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/reports/sync/12.xml</filepath>
 				</data>
@@ -3982,13 +3982,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='limited reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='limited reports'>
+		<test name='1'>
 			<exclude-feature>
 				<feature>sync-report-limit</feature>
 			</exclude-feature>
 			<description>Limit not allowed</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/timezones.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -44,7 +44,7 @@
 		</test>
 		<test name='2'>
 			<description>query for free busy with time range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -76,7 +76,7 @@
 		</test>
 		<test name='4'>
 			<description>query for free busy with time range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -112,7 +112,7 @@
 		</test>
 		<test name='2'>
 			<description>query for free busy with time range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>
@@ -146,7 +146,7 @@
 		</test>
 		<test name='4'>
 			<description>query for free busy with time range</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarpath1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/webcal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/webcal.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/webcal.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -127,7 +127,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -144,7 +144,7 @@
 		</test>
 		<test name='2'>
 			<description>GET on calendar after PUT - 2nd time from cache</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -192,7 +192,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>
@@ -209,7 +209,7 @@
 		</test>
 		<test name='2'>
 			<description>GET on calendar collection after DELETE - 2nd time from cache</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarpath1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/ab-client.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/ab-client.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/ab-client.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -77,7 +77,7 @@
 	<test-suite name='Polling'>
 		<test name='1'>
 			<description>PROPFIND addressbook home</description>
-			<request print-response="no">
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/aclreports.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -62,10 +62,10 @@
 -->
 	</start>
 	
-	<test-suite name='acl-principal-prop-set REPORT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='acl-principal-prop-set REPORT'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -85,9 +85,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -107,9 +107,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>No DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -129,9 +129,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Too many DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -147,9 +147,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>No DAV:read-acl privilege</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data>
@@ -165,9 +165,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Valid report</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -190,10 +190,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='principal-match REPORT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='principal-match REPORT'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<header>
@@ -213,9 +213,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<header>
@@ -235,9 +235,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Too many DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<data>
@@ -253,9 +253,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Valid self report with DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -275,9 +275,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Valid self report without DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principals_users:</ruri>
 				<data>
@@ -299,7 +299,7 @@
 		</test>
 		<test name='6' ignore='yes'>
 			<description>Valid principal-search report with DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data>
@@ -317,7 +317,7 @@
 		</test>
 		<test name='7' ignore='yes'>
 			<description>Valid principal-search report without DAV:prop</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data>
@@ -333,9 +333,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>principal-search with inaccessible property</description>
-			<request print-response='no' user='$userid2:' pswd='$pswd2:'>
+			<request user='$userid2:' pswd='$pswd2:'>
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data>
@@ -353,10 +353,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='principal-property-search REPORT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='principal-property-search REPORT'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<header>
@@ -376,9 +376,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<header>
@@ -398,9 +398,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Valid non-apply-to report with DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<data>
@@ -421,9 +421,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Valid non-apply-to report without DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<data>
@@ -445,9 +445,9 @@
 			</request>
 		</test>
 	<!--
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Valid apply-to report with DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -471,9 +471,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Valid non-apply-to report without DAV:prop</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -496,9 +496,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Valid INDIVIDUAL first-name AND last-name search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:</ruri>
 				<data>
@@ -518,9 +518,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Valid INDIVIDUAL first-name OR last-name search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -541,9 +541,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Valid ROOM displayname search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -563,9 +563,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Valid RESOURCE displayname search report</description>
-			<request print-response='no' user='$useradmin:' pswd='$pswdadmin:'>
+			<request user='$useradmin:' pswd='$pswdadmin:'>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -587,10 +587,10 @@
 		</test>
 	-->
 	</test-suite>
-	<test-suite name='principal-search-property-set REPORT' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='principal-search-property-set REPORT'>
+		<test name='1'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<header>
@@ -610,9 +610,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Wrong Depth</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<header>
@@ -632,9 +632,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Report on non-principal collection</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data>
@@ -651,9 +651,9 @@
 			</request>
 		</test>
 	<!--
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Valid report</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$principalcollection:</ruri>
 				<data>
@@ -675,10 +675,10 @@
 		-->
 	</test-suite>
 	<!--
-	<test-suite name='supported-report-set property' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='supported-report-set property'>
+		<test name='1'>
 			<description>Regular resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -705,9 +705,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Regular resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principalcollection:</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/add-member.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,7 +27,7 @@
 	</require-feature>
 
 	<start>
-		<request print-response='no'>
+		<request>
 			<method>DELETE</method>
 			<ruri>$addressbookpath1:/</ruri>
 		</request>
@@ -80,10 +80,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='POST VCARD' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='POST VCARD'>
+		<test name='1'>
 			<description>POST simple vCard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/$add-member:</ruri>
 				<data>
@@ -110,7 +110,7 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<request>
 				<method>GET</method>
 				<ruri>$posted:</ruri>
@@ -123,9 +123,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>re-POST simple vCard - UID conflict failure</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/$add-member:</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/bulk.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,7 +28,7 @@
 
 	<start/>
 	
-	<test-suite name='bulk-requests property' ignore='no'>
+	<test-suite name='bulk-requests property'>
 		<test name='1'>
 			<description>PROPFIND on address book</description>
 			<request>
@@ -77,13 +77,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Simple POST - one vcard' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Simple POST - one vcard'>
+		<test name='1'>
 			<description>POST single new vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/1.vcf</filepath>
 				</data>
@@ -109,7 +109,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -130,12 +130,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single existing vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/2.vcf</filepath>
 				</data>
@@ -149,7 +149,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -170,12 +170,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST single new different vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/3.vcf</filepath>
 				</data>
@@ -201,7 +201,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -222,7 +222,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -234,13 +234,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Simple POST - multiple vcards' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Simple POST - multiple vcards'>
+		<test name='1'>
 			<description>POST multiple new vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/4.vcf</filepath>
 				</data>
@@ -269,7 +269,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -290,7 +290,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -311,12 +311,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST one new, one exsting vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/7.vcf</filepath>
 				</data>
@@ -345,7 +345,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check unchanged</description>
 			<request>
 				<method>GET</method>
@@ -366,7 +366,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -387,7 +387,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -399,17 +399,17 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Simple POST - one vcard return data' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Simple POST - one vcard return data'>
+		<test name='1'>
 			<description>POST single new vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>X-MobileMe-DAV-Options</name>
 					<value>return-changed-data</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/9.vcf</filepath>
 				</data>
@@ -434,7 +434,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -455,7 +455,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -467,17 +467,17 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Simple POST - group vcard with return data' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Simple POST - group vcard with return data'>
+		<test name='1'>
 			<description>POST new group vcard with unordered and duplicate members</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>X-MobileMe-DAV-Options</name>
 					<value>return-changed-data</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/11.vcf</filepath>
 				</data>
@@ -511,7 +511,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -532,16 +532,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST new group vcard with ordered unique members</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>X-MobileMe-DAV-Options</name>
 					<value>return-changed-data</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/14.vcf</filepath>
 				</data>
@@ -566,7 +566,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -587,7 +587,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -599,7 +599,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Simple POST - ctag condition' ignore='no'>
+	<test-suite name='Simple POST - ctag condition'>
 		<test name='1'>
 			<description>PROPFIND on address book</description>
 			<request>
@@ -622,9 +622,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST single new vcard conditional fail</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -635,7 +635,7 @@
 					<name>If</name>
 					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:123>]]></value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/9.vcf</filepath>
 				</data>
@@ -648,9 +648,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single new vcard conditional ok</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -661,7 +661,7 @@
 					<name>If</name>
 					<value><![CDATA[<http://me.com/_namespace/ctag/$ctag:>]]></value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/simple/9.vcf</filepath>
 				</data>
@@ -701,7 +701,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -713,13 +713,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='CRUD POST - one vcard create' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='CRUD POST - one vcard create'>
+		<test name='1'>
 			<description>POST single new vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-one/1.xml</filepath>
 				</data>
@@ -745,7 +745,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -766,12 +766,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single existing vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-one/3.xml</filepath>
 				</data>
@@ -785,7 +785,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -806,12 +806,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>POST single new different vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-one/4.xml</filepath>
 				</data>
@@ -837,7 +837,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -858,7 +858,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -870,13 +870,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='CRUD POST - multiple' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='CRUD POST - multiple'>
+		<test name='1'>
 			<description>POST single new vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-multiple/1.xml</filepath>
 				</data>
@@ -902,7 +902,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -923,12 +923,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST add new and update existing</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-multiple/3.xml</filepath>
 				</data>
@@ -956,7 +956,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Data changed</description>
 			<request>
 				<method>GET</method>
@@ -977,7 +977,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -998,12 +998,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>POST delete and update existing</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-multiple/6.xml</filepath>
 				</data>
@@ -1029,7 +1029,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Data changed</description>
 			<request>
 				<method>GET</method>
@@ -1050,7 +1050,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Data gone</description>
 			<request>
 				<method>GET</method>
@@ -1064,7 +1064,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>
@@ -1076,13 +1076,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='CRUD POST - multiple if-match' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='CRUD POST - multiple if-match'>
+		<test name='1'>
 			<description>POST two new vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-ifmatch/1.xml</filepath>
 				</data>
@@ -1111,7 +1111,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1132,7 +1132,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1153,12 +1153,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST new, update and delete existing - if-match fail</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-ifmatch/4.xml</filepath>
 				</data>
@@ -1187,7 +1187,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1208,7 +1208,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1229,7 +1229,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1250,12 +1250,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>POST update and delete existing - if-match ok</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/bulk/crud-ifmatch/6.xml</filepath>
 				</data>
@@ -1281,7 +1281,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Data gone</description>
 			<request>
 				<method>GET</method>
@@ -1295,7 +1295,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Data changed</description>
 			<request>
 				<method>GET</method>
@@ -1316,7 +1316,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Data unchanged</description>
 			<request>
 				<method>GET</method>
@@ -1337,7 +1337,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETEALL</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/copymove.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -80,7 +80,7 @@
 	<test-suite name='COPY' ignore="yes">
 		<test name='1'>
 			<description>COPY within same addressbook with different name</description>
-			<request end-delete="no" print-response="no">
+			<request end-delete="no">
 				<method>COPY</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<header>
@@ -96,9 +96,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>COPY within same addressbook to existing resource with overwrite</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<header>
@@ -118,9 +118,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>COPY within same addressbook to existing resource without overwrite</description>
-			<request print-response="no">
+			<request>
 				<method>COPY</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<header>
@@ -145,7 +145,7 @@
 	<test-suite name="MOVE">
 		<test name='1'>
 			<description>MOVE within same addressbook to new resource</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookpath1:/5.vcf</ruri>
 				<header>
@@ -163,7 +163,7 @@
 		</test>
 		<test name='2'>
 			<description>MOVE within same addressbook to existing resource with overwrite</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookpath1:/6.vcf</ruri>
 				<header>
@@ -185,7 +185,7 @@
 		</test>
 		<test name='3'>
 			<description>MOVE within same addressbook to existing resource without overwrite</description>
-			<request print-response="no">
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/current-user-principal.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,8 +27,8 @@
 
 	<start/>
 	
-	<test-suite name='Check for the property on /' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Check for the property on /'>
+		<test name='1'>
 			<description>Check for authenticated property on /</description>
 			<request>
 				<method>PROPFIND</method>
@@ -50,7 +50,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check for unauthenticated property on /</description>
 			<request auth="no">
 				<method>PROPFIND</method>
@@ -72,7 +72,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for authenticated property on / (user02)</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
@@ -96,8 +96,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Check for the property on /principals/' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Check for the property on /principals/'>
+		<test name='1'>
 			<description>Check for authenticated property on /</description>
 			<request>
 				<method>PROPFIND</method>
@@ -119,7 +119,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check for unauthenticated property on /</description>
 			<request auth="no">
 				<method>PROPFIND</method>
@@ -141,7 +141,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check for authenticated property on / (user02)</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/default-addressbook.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -51,10 +51,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Change property' ignore='no'>
+	<test-suite name='Change property'>
 		<test name='2'>
 			<description>Set invalid property on home</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data>
@@ -72,7 +72,7 @@
 		</test>
 		<test name='3'>
 			<description>Set property on home</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data>
@@ -131,7 +131,7 @@
 -->
 		<test name='2'>
 			<description>Set property on home</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/directory-gateway.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,7 +31,7 @@
 	<test-suite name='Find the gateway'>
 		<test name='1'>
 			<description>PROPFIND of principal for gateway</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$principal1:/</ruri>
 				<header>
@@ -57,7 +57,7 @@
 		</test>
 		<test name='2'>
 			<description>PROPFIND of gateway</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$gateway1:</ruri>
 				<header>
@@ -81,7 +81,7 @@
 		</test>
 		<test name='3'>
 			<description>PROPFIND of gateway: DAV:resource-id</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$gateway1:</ruri>
 				<header>
@@ -103,7 +103,7 @@
 		</test>
 		<test name='4'>
 			<description>PROPFIND of gateway: no sync report</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$gateway1:</ruri>
 				<header>
@@ -125,7 +125,7 @@
 		</test>
 		<test name='5'>
 			<description>GET of gateway</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$directory:</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/errorcondition.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -110,7 +110,7 @@
 		-->
 	</start>
 	
-	<test-suite name='PUT' ignore='no'>
+	<test-suite name='PUT'>
 		<test name='1'>
 			<description>PUT non-addressbook data</description>
 			<request>
@@ -203,7 +203,7 @@
 		</test>
 		<test name='6'>
 			<description>PUT with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<data>
@@ -221,7 +221,7 @@
 		</test>
 		<test name='7'>
 			<description>PUT with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
@@ -239,7 +239,7 @@
 		</test>
 		<test name='8'>
 			<description>PUT with bad PHOTO property</description>
-			<request  end-delete='yes' print-response='no'>
+			<request  end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/17.vcf</ruri>
 				<data>
@@ -250,7 +250,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/17.vcf</ruri>
 				<verify>
@@ -264,7 +264,7 @@
 		</test>
 	</test-suite>
 	<!--
-	<test-suite name='COPY' ignore='no'>
+	<test-suite name='COPY'>
 		<test name='1'>
 			<description>COPY non-addressboook data</description>
 			<request>
@@ -357,7 +357,7 @@
 		</test>
 		<test name='6'>
 			<description>COPY with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$addressbookhome1:/6.vcf</ruri>
 				<header>
@@ -375,7 +375,7 @@
 		</test>
 		<test name='7'>
 			<description>COPY from addressbook with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$addressbookpath1:/6.vcf</ruri>
 				<header>
@@ -393,7 +393,7 @@
 		</test>
 		<test name='8'>
 			<description>COPY with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$addressbookhome1:/7.vcf</ruri>
 				<header>
@@ -411,7 +411,7 @@
 		</test>
 		<test name='9'>
 			<description>COPY from addressbook with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$addressbookhome1:/addressbook2/7.vcf</ruri>
 				<header>
@@ -429,7 +429,7 @@
 		</test>
 		<test name='10'>
 			<description>COPY with too many recurrence instances to new resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/8.vcf</ruri>
 				<header>
@@ -447,7 +447,7 @@
 		</test>
 		<test name='11'>
 			<description>COPY with too many recurrence instances to existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$calendarhome1:/9.vcf</ruri>
 				<header>
@@ -501,7 +501,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='MOVE' ignore='no'>
+	<test-suite name='MOVE'>
 		<test name='1'>
 			<description>MOVE non-addressbook data</description>
 			<request>
@@ -594,7 +594,7 @@
 		</test>
 		<test name='6'>
 			<description>MOVE with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookhome1:/6.vcf</ruri>
 				<header>
@@ -612,7 +612,7 @@
 		</test>
 		<test name='7'>
 			<description>MOVE from calendar with duplicate uids</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookpath1:/6.vcf</ruri>
 				<header>
@@ -630,7 +630,7 @@
 		</test>
 		<test name='8'>
 			<description>MOVE with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookhome1:/7.vcf</ruri>
 				<header>
@@ -648,7 +648,7 @@
 		</test>
 		<test name='9'>
 			<description>MOVE from calendar with different uid onto existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookpath1:/7.vcf</ruri>
 				<header>
@@ -666,7 +666,7 @@
 		</test>
 		<test name='10'>
 			<description>MOVE with too many recurrence instances to new resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookhome1:/8.vcf</ruri>
 				<header>
@@ -684,7 +684,7 @@
 		</test>
 		<test name='11'>
 			<description>MOVE with too many recurrence instances to existing resource</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$addressbookhome1:/9.vcf</ruri>
 				<header>
@@ -739,10 +739,10 @@
 	</test-suite>
 	-->
 	
-	<test-suite name='REPORT/addressbook-data' ignore='no'>
+	<test-suite name='REPORT/addressbook-data'>
 		<test name='1'>
 			<description>query with invalid address-data content-type</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -814,10 +814,10 @@
 		</test>
 	</test-suite>
 <!--
-	<test-suite name='REPORT/filter' ignore='no'>
+	<test-suite name='REPORT/filter'>
 		<test name='1'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -835,7 +835,7 @@
 		</test>
 		<test name='2'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -853,7 +853,7 @@
 		</test>
 		<test name='3'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -871,7 +871,7 @@
 		</test>
 		<test name='4'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -889,7 +889,7 @@
 		</test>
 		<test name='5'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -907,7 +907,7 @@
 		</test>
 		<test name='6'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -925,7 +925,7 @@
 		</test>
 		<test name='7'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -943,7 +943,7 @@
 		</test>
 		<test name='8'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -961,7 +961,7 @@
 		</test>
 		<test name='9'>
 			<description>query with invalid filter</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -979,7 +979,7 @@
 		</test>
 		<test name='10'>
 			<description>query with invalid time-range (dates)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -997,7 +997,7 @@
 		</test>
 		<test name='11'>
 			<description>query with invalid time-range (floating)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -1015,7 +1015,7 @@
 		</test>
 		<test name='12'>
 			<description>free-busy with invalid time-range (dates)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -1033,7 +1033,7 @@
 		</test>
 		<test name='13'>
 			<description>free-busy with invalid time-range (floating)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -1050,10 +1050,10 @@
 			</request>
 		</test>
 	</test-suite>
-	<test-suite name='REPORT/too big' ignore='no'>
+	<test-suite name='REPORT/too big'>
 		<test name='1'>
 			<description>add one event to make it a 1001 event calendar</description>
-			<request end-delete="yes" print-response='no'>
+			<request end-delete="yes">
 				<method>PUT</method>
 				<ruri>$addressbookhome1:/abc.vcf</ruri>
 				<data>
@@ -1064,7 +1064,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -1082,7 +1082,7 @@
 		</test>
 		<test name='2'>
 			<description>multiget with too many results</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:</ruri>
 				<data>
@@ -1100,10 +1100,10 @@
 		</test>
 	</test-suite>
 	-->
-	<test-suite name='Root resource' ignore='no'>
+	<test-suite name='Root resource'>
 		<test name='1'>
 			<description>DELETE /</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$root:</ruri>
 				<verify>
@@ -1117,7 +1117,7 @@
 		</test>
 		<test name='2'>
 			<description>COPY /</description>
-			<request print-response='no'>
+			<request>
 				<method>COPY</method>
 				<ruri>$root:</ruri>
 				<header>
@@ -1135,7 +1135,7 @@
 		</test>
 		<test name='3'>
 			<description>MOVE /</description>
-			<request print-response='no'>
+			<request>
 				<method>MOVE</method>
 				<ruri>$root:</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/errors.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/errors.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/errors.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -27,7 +27,7 @@
 
 	<start/>
 
-	<test-suite name='ERROR CONDITIONS' ignore='no'>
+	<test-suite name='ERROR CONDITIONS'>
 		<test name='1'>
 			<description>PUT duplicate UID contact</description>
 			<request>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/get.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/get.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/get.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -168,7 +168,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<verify>
@@ -194,7 +194,7 @@
 		</test>
 		<test name='5'>
 			<description>Conditional GET on addressbook collection</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -212,7 +212,7 @@
 		</test>
 		<test name='6'>
 			<description>Conditional GET on addressbook collection</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -230,7 +230,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='GET on home' ignore='no'>
+	<test-suite name='GET on home'>
 		<require-feature>
 			<feature>directory listing</feature>
 		</require-feature>
@@ -260,9 +260,9 @@
 				</grabheader>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Conditional GET on addressbook home</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -280,7 +280,7 @@
 		</test>
 		<test name='5'>
 			<description>Conditional GET on addressbook home</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/limits.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/limits.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/limits.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -28,10 +28,10 @@
 
 	<start/>
 	
-	<test-suite name='Limits in properties' ignore='no'>
+	<test-suite name='Limits in properties'>
 		<test name='1'>
 			<description>max-collections property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -53,7 +53,7 @@
 		</test>
 		<test name='2'>
 			<description>max-resources property</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -77,9 +77,9 @@
 
 <!--
 	<test-suite name='Collection limit' ignore='yes'>
-		<test name='1' count='49' ignore='no'>
+		<test name='1' count='49'>
 			<description>Create collections to one below the limit</description>
-			<request end-delete='yes' print-response='no'>
+			<request end-delete='yes'>
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/adbktest-##/</ruri>
 				<data>
@@ -95,9 +95,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Create collections to one below the limit</description>
-			<request print-response='no'>
+			<request>
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/adbktest-50/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/mkcol.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -25,10 +25,10 @@
 
 	<start/>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1' ignore='yes'>
 			<description>OPTIONS DAV: header does not contain extended-mkcol</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<verify>
@@ -42,7 +42,7 @@
 		</test>
 		<test name='2'>
 			<description>OPTIONS Allow: header does not contain MKCOL</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<verify>
@@ -56,7 +56,7 @@
 		</test>
 		<test name='3'>
 			<description>OPTIONS Allow: header does not contain MKCALENDAR</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/nonascii.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -29,9 +29,9 @@
 
 <!--
 	<test-suite name='non-ascii' ignore="yes">
-		<test name='1' ignore="no">
+		<test name='1'>
 			<description>MKCOL with high-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/T%c3%a9st/</ruri>
 				<data>
@@ -45,7 +45,7 @@
 		</test>
 		<test name='2' ignore="yes">
 			<description>MKCOL with non-ascii - duplicate</description>
-			<request print-response="no">
+			<request>
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/T%c3%a9st/</ruri>
 				<data>
@@ -61,9 +61,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore="no">
+		<test name='3'>
 			<description>GET with non-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookhome1:/T%c3%a9st/</ruri>
 				<verify>
@@ -71,9 +71,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore="no">
+		<test name='4'>
 			<description>DELETE with non-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookhome1:/T%c3%a9st/</ruri>
 				<verify>
@@ -86,7 +86,7 @@
 	
 <!--
 	<test-suite name='double byte' ignore="yes">
-		<test name='1' ignore="no">
+		<test name='1'>
 			<description>MKCOL with double byte</description>
 			<request end-delete="no">
 				<method>MKCOL</method>
@@ -100,9 +100,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>MKCOL with non-ascii - duplicate</description>
-			<request print-response="no">
+			<request>
 				<method>MKCOL</method>
 				<ruri>$addressbookhome1:/%E5%88%9D%E6%97%A5/</ruri>
 				<data>
@@ -120,7 +120,7 @@
 		</test>
 		<test name='3'>
 			<description>GET with non-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookhome1:/%E5%88%9D%E6%97%A5/</ruri>
 				<verify>
@@ -128,9 +128,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore="no">
+		<test name='4'>
 			<description>DELETE with non-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookhome1:/%E5%88%9D%E6%97%A5/</ruri>
 				<verify>
@@ -141,8 +141,8 @@
 	</test-suite>
  -->
 <!--
-	<test-suite name='Non-ascii resource URI' ignore="no">
-		<test name='1' ignore="no">
+	<test-suite name='Non-ascii resource URI'>
+		<test name='1'>
 			<description>PUT with high-ascii</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -156,7 +156,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>PUT with high-ascii</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -174,9 +174,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore="no">
+		<test name='3'>
 			<description>GET with high-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookhome1:/T%c3%a9st/te%cc%81st.vcf</ruri>
 				<verify>
@@ -184,9 +184,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore="no">
+		<test name='4'>
 			<description>GET with high-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookhome1:/Te%cc%81st/t%c3%a9st.vcf</ruri>
 				<verify>
@@ -194,9 +194,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore="no">
+		<test name='5'>
 			<description>DELETE with high-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookhome1:/Te%cc%81st/t%c3%a9st.vcf</ruri>
 				<verify>
@@ -205,8 +205,8 @@
 			</request>
 		</test>
 	</test-suite>
-	<test-suite name='Multiget on-ascii resource URI' ignore="no">
-		<test name='1' ignore="no">
+	<test-suite name='Multiget on-ascii resource URI'>
+		<test name='1'>
 			<description>MKCOL with high-ascii</description>
 			<request end-delete="yes">
 				<method>MKCOL</method>
@@ -216,9 +216,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>REPORT with high-ascii - match parent and child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/Tást/</ruri>
 				<data>
@@ -234,9 +234,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore="no">
+		<test name='3'>
 			<description>DELETE with high-ascii</description>
-			<request print-response="no">
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookhome1:/Tást/</ruri>
 				<verify>
@@ -244,9 +244,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore="no">
+		<test name='3'>
 			<description>REPORT with non-ascii - match parent, different child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/Tást/</ruri>
 				<data>
@@ -262,9 +262,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore="no">
+		<test name='4'>
 			<description>REPORT with non-ascii - different parent, match child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/Te%cc%81st/</ruri>
 				<data>
@@ -280,9 +280,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore="no">
+		<test name='5'>
 			<description>REPORT with non-ascii - different parent, different child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/Te%cc%81st/</ruri>
 				<data>
@@ -298,9 +298,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore="no">
+		<test name='6'>
 			<description>REPORT with non-ascii - match parent, match child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/T%c3%a9st/</ruri>
 				<data>
@@ -316,9 +316,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore="no">
+		<test name='7'>
 			<description>REPORT with non-ascii - match parent, different child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/T%c3%a9st/</ruri>
 				<data>
@@ -334,9 +334,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore="no">
+		<test name='8'>
 			<description>REPORT with non-ascii - different parent, match child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/T%c3%a9st/</ruri>
 				<data>
@@ -352,9 +352,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore="no">
+		<test name='9'>
 			<description>REPORT with non-ascii - different parent, different child</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/T%c3%a9st/</ruri>
 				<data>
@@ -372,8 +372,8 @@
 		</test>
 	</test-suite>
 	-->
-	<test-suite name='high-ascii addressbook data' ignore="no">
-		<test name='1' ignore="no">
+	<test-suite name='high-ascii addressbook data'>
+		<test name='1'>
 			<description>PUT with high-ascii data</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -387,9 +387,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>GET with non-ascii data</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/highascii.vcf</ruri>
 				<verify>
@@ -397,9 +397,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore="no">
+		<test name='3'>
 			<description>Basic query with high-ascii data</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -415,9 +415,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore="no">
+		<test name='4'>
 			<description>Text query with ascii data</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -434,8 +434,8 @@
 			</request>
 		</test>
 	</test-suite>
-	<test-suite name='Non-utf-8 address data' ignore="no">
-		<test name='1' ignore="no">
+	<test-suite name='Non-utf-8 address data'>
+		<test name='1'>
 			<description>PUT with non-utf-8 data without charset</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -453,7 +453,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>PUT with non-utf-8 data with utf-8 charset</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -471,7 +471,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore="no">
+		<test name='3'>
 			<description>PUT with non-utf-8 data with non-utf-8 charset</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -491,8 +491,8 @@
 		</test>
 	</test-suite>
 <!--
-	<test-suite name='Copy/Move Non-utf-8 calendar data' ignore="no">
-		<test name='1' ignore="no">
+	<test-suite name='Copy/Move Non-utf-8 calendar data'>
+		<test name='1'>
 			<description>PUT with non-utf-8 data to regular collection</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -506,7 +506,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>COPY non-utf-8 data to calendar collection</description>
 			<request end-delete="yes">
 				<method>COPY</method>
@@ -524,7 +524,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore="no">
+		<test name='3'>
 			<description>MOVE non-utf-8 data to calendar collection</description>
 			<request end-delete="yes">
 				<method>MOVE</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/proppatch.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/proppatch.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/proppatch.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -26,10 +26,10 @@
 
 	<start/>
 	
-	<test-suite name='prop patches' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches'>
+		<test name='1'>
 			<description>PROPPATCH of details: good</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -45,7 +45,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -66,9 +66,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPPATCH of details: remove it</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -83,7 +83,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -107,9 +107,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH remove non-existant</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -125,9 +125,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPPATCH of resourcetype: fails</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -144,7 +144,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -170,7 +170,7 @@
 		</test>
 		<test name='5'>
 			<description>PROPPATCH of encoded value</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -185,7 +185,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -207,9 +207,9 @@
 		</test>
 	</test-suite>
 	<test-suite name='prop patch property attributes'>
-		<test name='1' ignore="no">
+		<test name='1'>
 			<description>PROPPATCH with property XML attribute</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -224,7 +224,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -251,9 +251,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore="no">
+		<test name='2'>
 			<description>PROPPATCH of details: remove it</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -268,7 +268,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/put.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/put.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -33,10 +33,10 @@
 		</request>
 	</start>
 
-	<test-suite name='PUT VCARD' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='PUT VCARD'>
+		<test name='1'>
 			<description>PUT simple person contact</description>
-			<request end-delete='yes' print-response='yes'>
+			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
@@ -66,7 +66,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT contact created by Mulberry</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -98,7 +98,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PUT company contact</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -130,7 +130,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT contact with note</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -162,7 +162,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PUT contact with all default fields filled in</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -194,7 +194,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PUT contact with picture</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -226,7 +226,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PUT company contact with picture</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -258,7 +258,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>PUT contact with high ascii contents</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -290,7 +290,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>PUT contact with double bytes contents</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -322,7 +322,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>PUT contact with all custom fields</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -357,9 +357,9 @@
 	</test-suite>
 
 	<test-suite name='Test \ escapes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT simple person contact</description>
-			<request end-delete='yes' print-response='yes'>
+			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/11.vcf</ruri>
 				<data>
@@ -389,9 +389,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT with \n in ADR</description>
-			<request end-delete='yes' print-response='yes'>
+			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/12.vcf</ruri>
 				<data>
@@ -424,9 +424,9 @@
 	</test-suite>
 
 	<test-suite name='PUT with X- using VALUE != TEXT'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT simple person contact</description>
-			<request end-delete='yes' print-response='yes'>
+			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/13.vcf</ruri>
 				<data>
@@ -460,7 +460,7 @@
 
 
 	<test-suite name='PUTs with ^ parameter encoding'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Roundtrip encoded CN=</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -488,7 +488,7 @@
 	</test-suite>
 
 	<test-suite name='PUT groups'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PUT group with circular reference, unknown members, group data changed</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -520,7 +520,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PUT user over group</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -538,7 +538,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PUT group over user</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
@@ -556,7 +556,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PUT group over group, no data change</description>
 			<request end-delete='yes'>
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/reports.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -146,8 +146,8 @@
 		</request>
 	</start>
 	
-	<test-suite name="basic query reports" ignore="no">
-		<test name="1" ignore="no">
+	<test-suite name="basic query reports">
+		<test name="1">
 			<description>query for resources with no filter defined</description>
 			<request>
 				<method>REPORT</method>
@@ -179,9 +179,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="2" ignore="no">
+		<test name="2">
 			<description>query for resources with "is not defined"></description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -211,9 +211,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="3" ignore="no">
+		<test name="3">
 			<description>query for resources where the FN contains the character 'Pict'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -229,9 +229,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="4" ignore="no">
+		<test name="4">
 			<description>query for resources where EMAIL does not contain the character 'apple@'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -255,9 +255,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="5" ignore="no">
+		<test name="5">
 			<description>query for resources where EMAIL equals testinc_sf at testinc.com</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -273,9 +273,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="6" ignore="no">
+		<test name="6">
 			<description>query for resources where PHOTO property exists</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -296,9 +296,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="7" ignore="no">
+		<test name="7">
 			<description>query for resources where PHOTO property does not exist</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -322,9 +322,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="8" ignore="no">
+		<test name="8">
 			<description>query for resources where FN contains 'Pict'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -340,9 +340,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="9" ignore="no">
+		<test name="9">
 			<description>query for resources containing high ascii in FN</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -358,9 +358,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="10" ignore="no">
+		<test name="10">
 			<description>query for resources containing double bytes in FN</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -376,9 +376,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="11" ignore="no">
+		<test name="11">
 			<description>query for resources that contain 'Nd' in FN or 'john' in EMAIL</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -394,9 +394,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="12" ignore="no">
+		<test name="12">
 			<description>query for resources where NOTE property exists</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -416,9 +416,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="13" ignore="no">
+		<test name="13">
 			<description>query for resources where NOTE property contains 'contact'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -435,9 +435,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="14" ignore="no">
+		<test name="14">
 			<description>query for resources where FN property starts with 'Jo'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -454,9 +454,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="15" ignore="no">
+		<test name="15">
 			<description>query for resources where NICKNAME property end with 'ry'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -472,9 +472,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="16" ignore="no">
+		<test name="16">
 			<description>query for resources where NOTE property contains uppercase 'CONTACT'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -491,9 +491,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="17" ignore="no">
+		<test name="17">
 			<description>query on vCard for resources where EMAIL does not contain the character '@apple.com'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
@@ -509,9 +509,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="18" ignore="no">
+		<test name="18">
 			<description>query on vCard for resources where EMAIL does not contain the character '@example.com'</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
@@ -526,9 +526,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="19" ignore="no">
+		<test name="19">
 			<description>query for resources with no filter defined. limited to 8 results</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -555,9 +555,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="20" ignore="no">
+		<test name="20">
 			<description>query for resources with "is not defined", limited to 5 results></description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -581,9 +581,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="21" ignore="no">
+		<test name="21">
 			<description>query for resources with EMAIL contains '.com' and 'apple" with parameter TYPE = "WORK") limited to 4 responses</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -606,9 +606,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="22" ignore="no">
+		<test name="22">
 			<description>query for resources with (FN contains 'John' and 'And") or (EMAIL  contains 'apple' and 'ank')" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -625,9 +625,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="23" ignore="no">
+		<test name="23">
 			<description>query for resources with EMAIL with TYPE parameter = "work" and "pref" limited to 4 results</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -650,9 +650,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="24" ignore="no">
+		<test name="24">
 			<description>query for resources with (FN contains 'John' and 'And") AND (EMAIL  contains 'apple' and 'john') limited to 4 results"" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -668,9 +668,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="25" ignore="no">
+		<test name="25">
 			<description>query for resources with (FN contains 'John') AND (FN contains 'Anderson") AND (EMAIL  contains 'apple') AND (EMAIL  contains 'ank') limited to 4 results"" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -685,9 +685,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="26" ignore="no">
+		<test name="26">
 			<description>query for resources where (FN contains 'John') OR (FN contains 'Anderson") OR (EMAIL  contains 'apple') OR (EMAIL  contains 'ank') limited to 4 results" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -710,9 +710,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="27" ignore="no">
+		<test name="27">
 			<description>query for resources with (FN contains 'John' AND 'Anderson") OR (EMAIL  contains 'ank' with TYPE parameter = "work") limited to 4 results" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -729,9 +729,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="28" ignore="no">
+		<test name="28">
 			<description>query for resources with (URL contains "jp") OR (ADR  contains 'Japan') [group properties]" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -749,9 +749,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="29" ignore="no">
+		<test name="29">
 			<description>query for resources with (X-JABBER  contains 'apple') OR (ADR contains "Laguna" [group properties]" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -772,9 +772,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="30" ignore="no">
+		<test name="30">
 			<description>query for resources with UID starts with" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -791,9 +791,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="31" ignore="no">
+		<test name="31">
 			<description>query for resources with UID ends with" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -810,9 +810,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="32" ignore="no">
+		<test name="32">
 			<description>query for resources with UID equals" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -828,9 +828,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="33" ignore="no">
+		<test name="33">
 			<description>query for resources with UID contains" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -848,13 +848,13 @@
 			</request>
 		</test>
 	</test-suite>
-	<test-suite name='multiget reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='multiget reports'>
+		<test name='1'>
 			<description>basic multiget of 6 resources returning etag and entire vcf data</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/multiget/1.xml</filepath>
 				</data>
@@ -872,12 +872,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>basic multiget of 4 resources returning etag</description>
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/multiget/2.xml</filepath>
 				</data>
@@ -893,12 +893,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Does allprop</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/multiget/3.xml</filepath>
 				</data>
@@ -914,12 +914,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Does propname</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/multiget/4.xml</filepath>
 				</data>
@@ -935,12 +935,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Single non-existent query</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/multiget/5.xml</filepath>
 				</data>
@@ -953,12 +953,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>basic multiget of 3 resources returning and named properties and no etag</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/multiget/6.xml</filepath>
 				</data>
@@ -975,17 +975,17 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='directory gateway query reports' ignore='no'>
+	<test-suite name='directory gateway query reports'>
 		<require-feature>
 			<feature>directory-gateway</feature>
 		</require-feature>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>query for FN starts with "pub"</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchquery/1.xml</filepath>
 				</data>
@@ -1007,12 +1007,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for FN starts with "sim" in a unmatching vCard</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:$publicuserguid1:.vcf</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchquery/2.xml</filepath>
 				</data>
@@ -1024,12 +1024,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for EMAIL does not contain "b"</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchquery/3.xml</filepath>
 				</data>
@@ -1068,12 +1068,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for ADR is-not-defined</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchquery/4.xml</filepath>
 				</data>
@@ -1099,12 +1099,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for VERSION is end-with ".0" limited to 10 results</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchquery/5.xml</filepath>
 				</data>
@@ -1117,12 +1117,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query EMAIL contains "@example" with parameter "HOME"</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchquery/6.xml</filepath>
 				</data>
@@ -1135,12 +1135,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query FN contains "ic 01" and EMAIL contains "@example"</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchquery/7.xml</filepath>
 				</data>
@@ -1153,9 +1153,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="8" ignore="no">
+		<test name="8">
 			<description>query for resources with EMAIL contains '.com' and '01' with parameter TYPE = "WORK") limited to 4 responses</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1175,9 +1175,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="9" ignore="no">
+		<test name="9">
 			<description>query for resources with (FN contains 'Public' and '03") or (EMAIL  contains 'User' and '02')" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1194,9 +1194,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="10" ignore="no">
+		<test name="10">
 			<description>query for resources with EMAIL with TYPE parameter = "work" and "pref" limited to 4 results</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1216,9 +1216,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="11" ignore="no">
+		<test name="11">
 			<description>query for resources with (FN contains 'Public' and '03") AND (EMAIL  contains 'example' and 'public') limited to 4 results"" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1234,9 +1234,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="12" ignore="no">
+		<test name="12">
 			<description>query for resources with (FN contains 'Public' and '03") AND (EMAIL  contains 'example' and 'user') limited to 4 results"" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1251,9 +1251,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="13" ignore="no">
+		<test name="13">
 			<description>query for resources where (FN contains '02') OR (FN contains '03") OR (EMAIL  contains '04') OR (EMAIL  contains 'user')" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1288,9 +1288,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="14" ignore="no">
+		<test name="14">
 			<description>query for resources with (FN contains 'Public' or '03") AND (EMAIL  contains 'bogus' with TYPE parameter = "work") limited to 4 results" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1306,9 +1306,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="15" ignore="no">
+		<test name="15">
 			<description>query for resources with (KIND equal "group") and (FN contains "0"), no eTag " </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1346,9 +1346,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="16" ignore="no">
+		<test name="16">
 			<description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains $groupguid3:), no eTag, no props " </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1368,9 +1368,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name="17" ignore="no">
+		<test name="17">
 			<description>query for resources with ((KIND equal "individual") or (KIND is-not-defined)) and (FN contains "03")" </description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
 				<data>
@@ -1393,17 +1393,17 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='directory gateway multiget reports' ignore='no'>
+	<test-suite name='directory gateway multiget reports'>
 		<require-feature>
 			<feature>directory-gateway</feature>
 		</require-feature>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>basic multiget of 8 resources in search node returning etag and entire vcf data</description>
-			<request print-response="no">
+			<request>
 				<method>REPORT</method>
 				<ruri>$directory:</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/searchmultiget/1.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-access.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -96,8 +96,8 @@
 	</start>
 	
 
-	<test-suite name='fully-shared read-write addressbook' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='fully-shared read-write addressbook'>
+		<test name='0'>
 			<description>reset user1 home and share user2 addressbook read-write</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -105,7 +105,7 @@
 				<ruri>$notificationpath1:/</ruri>
 			</request>
 			<!-- user2 POSTs invitation -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/</ruri>
 				<data>
@@ -114,11 +114,11 @@
 				</data>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -127,7 +127,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -140,7 +140,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Sharee shared address book is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -174,7 +174,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Group for shared address book is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -208,7 +208,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>vCard in shared address book is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -242,7 +242,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Cannot change group address book</description>
 			<request>
 				<method>PUT</method>
@@ -260,7 +260,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>add vCard</description>
 			<request>
 				<method>PUT</method>
@@ -274,7 +274,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>New vCard is member of addressbook group</description>
 			<request>
 				<method>GET</method>
@@ -294,7 +294,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETE</method>
@@ -306,8 +306,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='fully-shared read-only addressbook' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='fully-shared read-only addressbook'>
+		<test name='0'>
 			<description>reset user1 home and share user2 addressbook read-only</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -316,7 +316,7 @@
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 			<!-- user2 POSTs invitation -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/</ruri>
 				<data>
@@ -325,11 +325,11 @@
 				</data>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -338,7 +338,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -351,7 +351,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>shared address book is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -385,7 +385,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Group for shared address book is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -419,7 +419,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>vCard in shared address book is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -453,7 +453,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>vCard in shared address book cannot be deleted</description>
 			<request>
 				<method>DELETE</method>
@@ -467,7 +467,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>vCard in shared address book cannot be modified</description>
 			<request>
 				<method>PUT</method>
@@ -488,11 +488,11 @@
 	</test-suite>
 
 
-	<test-suite name='read-write shared group' ignore='no'>
+	<test-suite name='read-write shared group'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<description>reset user1 home and share user2 group read-write</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -500,7 +500,7 @@
 				<ruri>$notificationpath1:/</ruri>
 			</request>
 			<!-- user2 POSTs invitation -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/g123.vcf</ruri>
 				<data>
@@ -512,11 +512,11 @@
 				</verify>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -525,7 +525,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -541,7 +541,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Sharee shared address book is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -575,7 +575,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>vCard for shared group is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -606,7 +606,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>vCard in shared group is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -637,7 +637,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>vCard in shared group can be deleted</description>
 			<request>
 				<method>DELETE</method>
@@ -647,7 +647,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>vCard with new UID shared read-write group can be added</description>
 			<request>
 				<method>PUT</method>
@@ -661,7 +661,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>New vCard is member of shared group</description>
 			<request>
 				<method>GET</method>
@@ -675,7 +675,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>restore group membership</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
@@ -723,11 +723,11 @@
 	</test-suite>
 
 
-	<test-suite name='read-only shared group' ignore='no'>
+	<test-suite name='read-only shared group'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<description>reset user1 home and share user2 group 345 read-only</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -736,7 +736,7 @@
 				<ruri>$notificationpath2:/</ruri>
 			</request>
 			<!-- user2 POSTs invitation -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/g345.vcf</ruri>
 				<data>
@@ -748,11 +748,11 @@
 				</verify>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -761,7 +761,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -774,7 +774,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Sharee shared address book is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -808,7 +808,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>vCard for shared read-only group is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -839,7 +839,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>vCard in shared read-only group is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -870,7 +870,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>vCard in shared read-only group cannot be deleted</description>
 			<request>
 				<method>DELETE</method>
@@ -884,7 +884,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>vCard in shared read-only group cannot be modified</description>
 			<request>
 				<method>PUT</method>
@@ -904,11 +904,11 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='overlapping read-only, read-write shared group' ignore='no'>
+	<test-suite name='overlapping read-only, read-write shared group'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<description>reset user1 home and share user2 group g123 read-write, group 345 read-only</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -916,7 +916,7 @@
 				<ruri>$notificationpath1:/</ruri>
 			</request>
 			<!-- user2 POSTs read-write invitation to group -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/g123.vcf</ruri>
 				<data>
@@ -928,11 +928,11 @@
 				</verify>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -941,7 +941,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -954,7 +954,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 			<!-- user2 POSTs invitation read-only to group -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/g345.vcf</ruri>
 				<data>
@@ -966,11 +966,11 @@
 				</verify>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -979,7 +979,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -992,7 +992,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Sharee shared address book is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1026,7 +1026,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>vCard for shared read-write group is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1057,7 +1057,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>vCard for shared read-only group is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1088,7 +1088,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>vCard in read-write group is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1119,7 +1119,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>vCard in read-only and read-write group is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1150,7 +1150,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>vCard in shared read-only group is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1181,7 +1181,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>add vCard</description>
 			<request>
 				<method>PUT</method>
@@ -1195,7 +1195,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>New vCard is member of shared read-write group</description>
 			<request>
 				<method>GET</method>
@@ -1209,7 +1209,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>New vCard is not member of read-only group</description>
 			<request>
 				<method>GET</method>
@@ -1223,7 +1223,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETE</method>
@@ -1235,14 +1235,14 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='overlapping read-only, read-write shared groups, read-write addressbook' ignore='no'>
+	<test-suite name='overlapping read-only, read-write shared groups, read-write addressbook'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<description>share user2 addressbook read-write</description>
 			<!-- user2 POSTs invitation -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/</ruri>
 				<data>
@@ -1251,11 +1251,11 @@
 				</data>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -1264,7 +1264,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -1277,7 +1277,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>vCard in read-only group is read-write</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1308,7 +1308,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>add vCard</description>
 			<request>
 				<method>PUT</method>
@@ -1322,7 +1322,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>New vCard is NOT member of shared read-write group</description>
 			<request>
 				<method>GET</method>
@@ -1336,7 +1336,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>New vCard is not member of read-only group</description>
 			<request>
 				<method>GET</method>
@@ -1350,7 +1350,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>New vCard is member of addressbook group</description>
 			<request>
 				<method>GET</method>
@@ -1370,7 +1370,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
 			<request>
 				<method>DELETE</method>
@@ -1382,14 +1382,14 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='overlapping read-only, read-write shared groups, read-only addressbook' ignore='no'>
+	<test-suite name='overlapping read-only, read-write shared groups, read-only addressbook'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<description>share user2 addressbook read-only</description>
 			<!-- user2 POSTs invitation -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/</ruri>
 				<data>
@@ -1398,11 +1398,11 @@
 				</data>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -1411,7 +1411,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -1424,7 +1424,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>shared address book is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1458,7 +1458,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>vCard in shared read-only group is read-only</description>
 			<request>
 				<method>PROPFIND</method>
@@ -1491,11 +1491,11 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='add to ab with two read-write shared groups' ignore='no'>
+	<test-suite name='add to ab with two read-write shared groups'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<description>unshare address book, share 345 read-write</description>
 			<request>
 				<method>DELETE</method>
@@ -1505,7 +1505,7 @@
 				</verify>
 			</request>
 			<!-- user2 POSTs invitation read-write to group 345 -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/g345.vcf</ruri>
 				<data>
@@ -1517,11 +1517,11 @@
 				</verify>
 			</request>
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -1530,7 +1530,7 @@
 				</grabelement>
 			</request>
 			<!-- user1 replies ACCEPTED and deletes notification -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -1543,7 +1543,7 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>vCard with new UID shared read-write group can be added</description>
 			<request>
 				<method>PUT</method>
@@ -1557,7 +1557,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>New vCard is member of shared group</description>
 			<request>
 				<method>GET</method>
@@ -1571,7 +1571,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>New vCard is member of shared group</description>
 			<request>
 				<method>GET</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-addressbooks.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -36,10 +36,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Read-write address book' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Read-write address book'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -51,13 +51,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check sharee notification collection for and get invite uid </description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -78,9 +78,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data substitutions="yes">
@@ -96,9 +96,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<header>
@@ -130,9 +130,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Shared address book exists Depth:1</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<header>
@@ -167,9 +167,9 @@
 					</arg>
 				</verify>
 			</request>
-		</test><test name='6' ignore='no'>
+		</test><test name='6'>
 			<description>Sharee creates vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/1.vcf</ruri>
 				<data>
@@ -181,9 +181,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Sharer sees vcard</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<verify>
@@ -195,9 +195,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Sharer changes vcard</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
@@ -209,9 +209,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sharee sees changed vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/1.vcf</ruri>
 				<verify>
@@ -223,9 +223,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Sharer creates vcard</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<data>
@@ -237,9 +237,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Sharee sees new vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/2.vcf</ruri>
 				<verify>
@@ -251,9 +251,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sharee changes vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/2.vcf</ruri>
 				<data>
@@ -265,9 +265,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Sharer sees changed event</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<verify>
@@ -279,9 +279,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Sharee sees group for shared address book</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/addressbook.vcf</ruri>
 				<verify>
@@ -301,13 +301,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Shared address book cannot be default address' ignore='no'>
+	<test-suite name='Shared address book cannot be default address'>
 		<require-feature>
 			<feature>default-addressbook</feature>
 		</require-feature>
 		<test name='1'>
 			<description>Set property on home</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data>
@@ -325,7 +325,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify property on home</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<header>
@@ -347,10 +347,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Change to read-only address book' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Change to read-only address book'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -364,11 +364,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -398,10 +398,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/addressbooks/read-only/3.xml</filepath>
 				</data>
@@ -416,7 +416,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<header>
@@ -450,7 +450,7 @@
 		</test>
 		<test name='5'>
 			<description>Create vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/3.vcf</ruri>
 				<data>
@@ -468,7 +468,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharer creates vcard</description>
-			<request print-response="no">
+			<request>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/4.vcf</ruri>
 				<data>
@@ -482,7 +482,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee sees new vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedaddressbook:/4.vcf</ruri>
 				<verify>
@@ -496,7 +496,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharee cannot change vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$sharedaddressbook:/4.vcf</ruri>
 				<data>
@@ -514,10 +514,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Reshare after sharee DELETE shared addressbook' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='Reshare after sharee DELETE shared addressbook'>
+		<test name='0'>
 			<description>Delete address book group</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<verify>
@@ -529,9 +529,9 @@
 				<ruri>$notificationpath1:/</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -543,13 +543,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check sharee notification collection for and get invite uid </description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -570,9 +570,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<data substitutions="yes">
@@ -588,9 +588,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Shared address book exists</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedaddressbook:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-bulk.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,8 +31,8 @@
 	<start>
 	</start>
 	
-	<test-suite name='POST with circular groups' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='POST with circular groups'>
+		<test name='0'>
 			<description>clean up old data</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -50,7 +50,7 @@
 				</data>
 			</request>
 			<description>user2 POSTs invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/1.vcf</ruri>
 				<data>
@@ -59,11 +59,11 @@
 				</data>
 			</request>
 			<description>Check user1 notification collection and get invite uid</description>
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -72,7 +72,7 @@
 				</grabelement>
 			</request>
 			<description>user1 replies ACCEPTED and deletes notification</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -85,12 +85,12 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST multiple new vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/$userguid2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/bulk/7.vcf</filepath>
 				</data>
@@ -115,7 +115,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -136,7 +136,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -157,7 +157,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -178,7 +178,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -199,7 +199,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -220,9 +220,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='-1' ignore='no'>
+		<test name='-1'>
 			<description>Clean up</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETEALL</method>
 				<ruri>$href1:</ruri>
 				<ruri>$href2:</ruri>
@@ -236,8 +236,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='POST with circular groups and one bad reference' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='POST with circular groups and one bad reference'>
+		<test name='0'>
 			<description>clean up old data</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -255,7 +255,7 @@
 				</data>
 			</request>
 			<description>user2 POSTs invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/1.vcf</ruri>
 				<data>
@@ -264,11 +264,11 @@
 				</data>
 			</request>
 			<description>Check user1 notification collection and get invite uid</description>
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -277,7 +277,7 @@
 				</grabelement>
 			</request>
 			<description>user1 replies ACCEPTED and deletes notification</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -290,12 +290,12 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST multiple new vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/$userguid2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/vcard; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/bulk/8.vcf</filepath>
 				</data>
@@ -362,7 +362,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -383,7 +383,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -404,7 +404,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -427,8 +427,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='CRUD POST with circular groups' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='CRUD POST with circular groups'>
+		<test name='0'>
 			<description>clean up old data</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -446,7 +446,7 @@
 				</data>
 			</request>
 			<description>user2 POSTs invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/1.vcf</ruri>
 				<data>
@@ -455,11 +455,11 @@
 				</data>
 			</request>
 			<description>Check user1 notification collection and get invite uid</description>
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -468,7 +468,7 @@
 				</grabelement>
 			</request>
 			<description>user1 replies ACCEPTED and deletes notification</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -481,12 +481,12 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST multiple new vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/$userguid2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/bulk/11.xml</filepath>
 				</data>
@@ -511,7 +511,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -532,7 +532,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -553,7 +553,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -574,7 +574,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -595,7 +595,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -618,8 +618,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='crud POST with circular groups and one bad reference' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='crud POST with circular groups and one bad reference'>
+		<test name='0'>
 			<description>clean up old data</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -637,7 +637,7 @@
 				</data>
 			</request>
 			<description>user2 POSTs invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/1.vcf</ruri>
 				<data>
@@ -646,11 +646,11 @@
 				</data>
 			</request>
 			<description>Check user1 notification collection and get invite uid</description>
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -659,7 +659,7 @@
 				</grabelement>
 			</request>
 			<description>user1 replies ACCEPTED and deletes notification</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -672,12 +672,12 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST multiple new vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/$userguid2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/bulk/12.xml</filepath>
 				</data>
@@ -743,7 +743,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -764,7 +764,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Check valid data</description>
 			<request>
 				<method>GET</method>
@@ -787,8 +787,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='crud POST delete cannot delete (unshare) read-write shared group' ignore='no'>
-		<test name='0' ignore='no'>
+	<test-suite name='crud POST delete cannot delete (unshare) read-write shared group'>
+		<test name='0'>
 			<description>clean up old data</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -806,7 +806,7 @@
 				</data>
 			</request>
 			<description>user2 POSTs invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/1.vcf</ruri>
 				<data>
@@ -815,11 +815,11 @@
 				</data>
 			</request>
 			<description>Check user1 notification collection and get invite uid</description>
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -828,7 +828,7 @@
 				</grabelement>
 			</request>
 			<description>user1 replies ACCEPTED and deletes notification</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -841,12 +841,12 @@
 				<ruri>$notificationpath1:/$inviteuid:</ruri>
 			</request>
 		</test>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST multiple new vcards</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/$userguid2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/bulk/11.xml</filepath>
 				</data>
@@ -871,12 +871,12 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Delete shared group and other group</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/$userguid2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/bulk/13.xml</filepath>
 				</data>
@@ -894,7 +894,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>group still here</description>
 			<request>
 				<method>GET</method>
@@ -904,7 +904,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Data gone</description>
 			<request>
 				<method>GET</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-feature.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -34,10 +34,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='OPTIONS header' ignore='no'>
+	<test-suite name='OPTIONS header'>
 		<test name='1'>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -51,7 +51,7 @@
 		</test>
 		<test name='2'>
 			<description>Look for options header tag on addressbook</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<verify>
@@ -66,9 +66,9 @@
 	</test-suite>
 
 	<test-suite name='Allowed modes'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Check mode</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -90,7 +90,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Upgrade addressbook to shared' ignore='no'>
+	<test-suite name='Upgrade addressbook to shared'>
 		<test name='1'>
 			<description>clear addressbook</description>
 			<request>
@@ -101,9 +101,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Not shared</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -125,7 +125,7 @@
 		</test>
 		<test name='3'>
 			<description>Upgrade via PROPPATCH</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-groups.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,7 +37,7 @@
 		</request>
 
 		<!-- Sharer creates 2 persons and a group -->
-		<request print-response='no'>
+		<request>
 			<method>PUT</method>
 			<ruri>$addressbookpath1:/1.vcf</ruri>
 			<data>
@@ -48,7 +48,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PUT</method>
 			<ruri>$addressbookpath1:/2.vcf</ruri>
 			<data>
@@ -59,7 +59,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PUT</method>
 			<ruri>$addressbookpath1:/3.vcf</ruri>
 			<data>
@@ -73,10 +73,10 @@
 	</start>
 	
 
-	<test-suite name='read-write' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='read-write'>
+		<test name='1'>
 			<description>POST invitation to user vCard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<data>
@@ -92,9 +92,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation to group vCard</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
@@ -106,9 +106,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Sharer sees group as shared-owner</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response='no'>
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<header>
@@ -138,13 +138,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -165,12 +165,12 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/groups/read-write/6.xml</filepath>
 				</data>
@@ -183,9 +183,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee sees shared address book</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -217,9 +217,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Sharee sees shared address book and shared vCards</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -253,7 +253,7 @@
 		</test>
 		<test name='8'>
 			<description>Shared address book exists Depth:1</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/</ruri>
 				<header>
@@ -289,9 +289,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sharee sees shared group vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$sharedgroup:</ruri>
 				<verify>
@@ -303,9 +303,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Sharee creates group vcard with unknown member UID</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
 				<data>
@@ -321,9 +321,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Sharee creates group vcard with member UID in ab but not in group</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
 				<data>
@@ -339,9 +339,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sharee creates vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
 				<data>
@@ -353,9 +353,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Sharer sees vcard as group member</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/4.vcf</ruri>
 				<verify>
@@ -367,9 +367,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Sharer sees vcard as group member</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<verify>
@@ -381,9 +381,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Sharer changes vcard</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/4.vcf</ruri>
 				<data>
@@ -395,7 +395,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>Sharee sees changed vcard</description>
 			<request>
 				<method>GET</method>
@@ -409,9 +409,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17' ignore='no'>
+		<test name='17'>
 			<description>Sharee sees changed vcard</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$addressbookhome2:/$userguid1:/4.vcf</ruri>
 				<verify>
@@ -423,9 +423,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>Sharer creates subgroup that contains 2 already present members</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/5.vcf</ruri>
 				<data>
@@ -437,9 +437,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='19'>
 			<description>Sharee sees new vcards</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$addressbookhome2:/$userguid1:/5.vcf</ruri>
 				<verify>
@@ -451,9 +451,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20' ignore='no'>
+		<test name='20'>
 			<description>Sharee sees new vcards</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$addressbookhome2:/$userguid1:/2.vcf</ruri>
 				<verify>
@@ -465,9 +465,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='21'>
 			<description>Sharee sees new vcards</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$addressbookhome2:/$userguid1:/1.vcf</ruri>
 				<verify>
@@ -479,9 +479,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22' ignore='no'>
+		<test name='22'>
 			<description>Sharee removes vCard from subgroup</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PUT</method>
 				<ruri>$addressbookhome2:/$userguid1:/5.vcf</ruri>
 				<data>
@@ -493,9 +493,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23' ignore='no'>
+		<test name='23'>
 			<description>Sharee cannot access removed sub group member</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
 				<ruri>$addressbookhome2:/$userguid1:/1.vcf</ruri>
 				<verify>
@@ -507,9 +507,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24' ignore='no'>
+		<test name='24'>
 			<description>Sharer sees subgroup changes and removed subgroup member</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/5.vcf</ruri>
 				<verify>
@@ -521,9 +521,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='25' ignore='no'>
+		<test name='25'>
 			<description>Sharer sees removed subgroup member</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/1.vcf</ruri>
 				<verify>
@@ -535,9 +535,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='26' ignore='no'>
+		<test name='26'>
 			<description>Sharee deletes vCard in subgroup</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$addressbookhome2:/$userguid1:/2.vcf</ruri>
 				<verify>
@@ -545,9 +545,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='27' ignore='no'>
+		<test name='27'>
 			<description>Sharer sees subgroup changes</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/5.vcf</ruri>
 				<verify>
@@ -559,9 +559,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='28' ignore='no'>
+		<test name='28'>
 			<description>sharee-deleted subgroup member is gone</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$addressbookpath1:/2.vcf</ruri>
 				<verify>
@@ -573,9 +573,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='29' ignore='no'>
+		<test name='29'>
 			<description>Unshare main address book</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
@@ -591,13 +591,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='30' ignore='no'>
+		<test name='30'>
 			<description>Check Sharee notification collection and delete invite-deleted</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -613,14 +613,14 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$</ruri>
 			</request>
 		</test>
-		<test name='31' ignore='no'>
+		<test name='31'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-peruser-properties.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -36,10 +36,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Set up share' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Set up share'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -53,11 +53,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -80,10 +80,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -104,9 +104,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -136,7 +136,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -154,10 +154,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='prop patches - non-global' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches - non-global'>
+		<test name='1'>
 			<description>PROPPATCH of displayname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -172,7 +172,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -192,9 +192,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND of shared displayname</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -214,9 +214,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH of displayname</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<data>
@@ -231,7 +231,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -251,9 +251,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPFIND of shared displayname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -275,10 +275,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='prop patches - shadowable' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches - shadowable'>
+		<test name='1'>
 			<description>PROPPATCH of addressbook-description</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -293,7 +293,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -313,9 +313,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND of shared addressbook-description</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -335,9 +335,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPPATCH of addressbook-description</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<data>
@@ -352,7 +352,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -372,9 +372,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPFIND of shared addressbook-description</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-put.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -63,7 +63,7 @@
 			</data>
 		</request>
 		<!-- user2 POSTs invitation -->
-		<request user="$userid2:" pswd="$pswd2:" print-response="no">
+		<request user="$userid2:" pswd="$pswd2:">
 			<method>POST</method>
 			<ruri>$addressbookpath2:/2.vcf</ruri>
 			<data>
@@ -75,11 +75,11 @@
 			</verify>
 		</request>
 		<!-- Check user1 notification collection and get invite uid -->
-		<request print-response="no">
+		<request>
 			<method>WAITCOUNT 1</method>
 			<ruri>$notificationpath1:/</ruri>
 		</request>
-		<request print-response="no">
+		<request>
 			<method>GETNEW</method>
 			<ruri>$notificationpath1:/</ruri>
 			<grabelement>
@@ -88,7 +88,7 @@
 			</grabelement>
 		</request>
 		<!-- user1 replies ACCEPTED and deletes notification -->
-		<request print-response="no">
+		<request>
 			<method>POST</method>
 			<ruri>$addressbookhome1:/</ruri>
 			<data substitutions="yes">
@@ -106,8 +106,8 @@
 	</start>
 
 
-	<test-suite name='add users to sharee address book' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='add users to sharee address book'>
+		<test name='1'>
 			<description>cannot add vcard with UID in sharer address book</description>
 			<request>
 				<method>PUT</method>
@@ -125,7 +125,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>cannot add group with member in sharer address book</description>
 			<request>
 				<method>PUT</method>
@@ -143,7 +143,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>cannot add vCard with name in sharer address book</description>
 			<request>
 				<method>PUT</method>
@@ -161,7 +161,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>can add group with member in shared group</description>
 			<request>
 				<method>PUT</method>
@@ -175,7 +175,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>can delete user</description>
 			<request>
 				<method>DELETE</method>
@@ -185,7 +185,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>user is removed from sharee group</description>
 			<request>
 				<method>GET</method>
@@ -199,7 +199,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>user is deleted from sharer address book</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>
@@ -213,7 +213,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>member is removed from sharee group</description>
 			<request>
 				<method>GET</method>
@@ -227,7 +227,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>member is removed from shared group</description>
 			<request>
 				<method>GET</method>
@@ -241,7 +241,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>member is NOT removed from 2nd sharer group</description>
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>GET</method>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-replies.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -36,10 +36,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Send first reply' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Send first reply'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -53,11 +53,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -80,10 +80,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/replies/accept/3.xml</filepath>
 				</data>
@@ -104,9 +104,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -136,7 +136,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -152,9 +152,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check sharee addressbook displayname/shared-url</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -175,9 +175,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check sharer addressbook displyname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -199,13 +199,13 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Update reply' ignore='no'>
+	<test-suite name='Update reply'>
 		<test name='1'>
 			<description>Sharee replies DECLINED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/replies/decline/1.xml</filepath>
 				</data>
@@ -214,9 +214,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check declined status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -246,7 +246,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-sync.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -175,7 +175,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2.xml</filepath>
 				</data>
@@ -198,7 +198,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -219,7 +219,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -240,7 +240,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -260,7 +260,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -281,7 +281,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -298,7 +298,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -321,7 +321,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -338,7 +338,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
 				</data>
@@ -370,7 +370,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -391,7 +391,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -413,7 +413,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -434,7 +434,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -455,7 +455,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -477,7 +477,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -513,7 +513,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -534,7 +534,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -556,7 +556,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -577,7 +577,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -598,7 +598,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -620,7 +620,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -652,7 +652,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -673,7 +673,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -698,7 +698,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -719,7 +719,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -740,7 +740,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -765,7 +765,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -801,7 +801,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -822,7 +822,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -843,7 +843,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -860,7 +860,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -881,7 +881,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -902,7 +902,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$sharedaddressbook:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -1029,7 +1029,7 @@
 		</test>
 		<test name='2'>
 			<description>user1 POSTs invitation</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/3.vcf</ruri>
 				<data>
@@ -1082,7 +1082,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1103,7 +1103,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1124,7 +1124,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -1144,7 +1144,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -1165,7 +1165,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -1182,7 +1182,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -1205,7 +1205,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -1222,7 +1222,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
 				</data>
@@ -1258,7 +1258,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1279,7 +1279,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1302,7 +1302,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -1324,7 +1324,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -1345,7 +1345,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -1368,7 +1368,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -1405,7 +1405,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1426,7 +1426,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1448,7 +1448,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -1469,7 +1469,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -1490,7 +1490,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -1512,7 +1512,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -1548,7 +1548,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1569,7 +1569,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1591,7 +1591,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -1612,7 +1612,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -1632,7 +1632,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -1652,7 +1652,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -1687,7 +1687,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1708,7 +1708,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1730,7 +1730,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -1751,7 +1751,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -1771,7 +1771,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -1791,7 +1791,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -1822,7 +1822,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1843,7 +1843,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1868,7 +1868,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -1889,7 +1889,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -1909,7 +1909,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -1929,7 +1929,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -1960,7 +1960,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1981,7 +1981,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -2007,7 +2007,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -2032,7 +2032,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -2053,7 +2053,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -2079,7 +2079,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -2119,7 +2119,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -2140,7 +2140,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -2161,7 +2161,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -2178,7 +2178,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -2199,7 +2199,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -2220,7 +2220,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -2405,7 +2405,7 @@
 		</test>
 		<test name='2'>
 			<description>user1 POSTs invitation</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/6.vcf</ruri>
 				<data>
@@ -2458,7 +2458,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -2479,7 +2479,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -2500,7 +2500,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -2520,7 +2520,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -2541,7 +2541,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -2558,7 +2558,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -2583,7 +2583,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
 				</data>
@@ -2604,7 +2604,7 @@
 		</test>
 		<test name='6'>
 			<description>user1 POSTs invitation</description>
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/7.vcf</ruri>
 				<data>
@@ -2657,7 +2657,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -2678,7 +2678,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -2699,7 +2699,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -2719,7 +2719,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -2740,7 +2740,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -2757,7 +2757,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -2785,7 +2785,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -2802,7 +2802,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
 				</data>
@@ -2844,7 +2844,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -2865,7 +2865,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -2889,7 +2889,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -2912,7 +2912,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -2933,7 +2933,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -2957,7 +2957,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -2995,7 +2995,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -3016,7 +3016,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -3038,7 +3038,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -3059,7 +3059,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -3080,7 +3080,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -3102,7 +3102,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -3134,7 +3134,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -3155,7 +3155,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -3182,7 +3182,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -3208,7 +3208,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -3229,7 +3229,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -3256,7 +3256,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -3297,7 +3297,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -3318,7 +3318,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -3339,7 +3339,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -3356,7 +3356,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -3377,7 +3377,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -3394,7 +3394,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -3419,7 +3419,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -3436,7 +3436,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
 				</data>
@@ -3474,7 +3474,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -3495,7 +3495,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -3516,7 +3516,7 @@
 			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -3533,7 +3533,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -3554,7 +3554,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -3575,7 +3575,7 @@
 			<request user="$userid2:" pswd="$pswd2:">
 				<method>REPORT</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -3625,7 +3625,7 @@
 
 			<!-- share user2 address book with user1 -->
 			<!-- user2 POSTs invitation -->
-			<request user="$userid2:" pswd="$pswd2:" print-response="no">
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookpath2:/</ruri>
 				<data>
@@ -3635,11 +3635,11 @@
 			</request>
 
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -3649,7 +3649,7 @@
 			</request>
 
 			<!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -3838,7 +3838,7 @@
 		</test>
 		<test name='5'>
 			<description>Look for options header tag on principal</description>
-			<request print-response="no">
+			<request>
 				<method>OPTIONS</method>
 				<ruri>$principal1:</ruri>
 				<verify>
@@ -4612,7 +4612,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -4645,7 +4645,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -4667,7 +4667,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/24.xml</filepath>
 				</data>
@@ -4730,7 +4730,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -4958,7 +4958,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/26.xml</filepath>
 				</data>
@@ -4999,7 +4999,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/26.xml</filepath>
 				</data>
@@ -5021,7 +5021,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/27.xml</filepath>
 				</data>
@@ -5095,7 +5095,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/26.xml</filepath>
 				</data>
@@ -5149,7 +5149,7 @@
 
 			<!-- share user3 address book with user1 -->
 			<!-- user3 POSTs invitation -->
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$addressbookpath3:/</ruri>
 				<data>
@@ -5159,11 +5159,11 @@
 			</request>
 
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -5173,7 +5173,7 @@
 			</request>
 
 			<!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -5206,7 +5206,7 @@
 
 			<!-- share user4 address book with user1 -->
 			<!-- user4 POSTs invitation -->
-			<request user="$userid4:" pswd="$pswd4:" print-response="no">
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>POST</method>
 				<ruri>$addressbookpath4:/</ruri>
 				<data>
@@ -5216,11 +5216,11 @@
 			</request>
 
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -5230,7 +5230,7 @@
 			</request>
 
 			<!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -5315,7 +5315,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -5349,7 +5349,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -5375,7 +5375,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/24.xml</filepath>
 				</data>
@@ -5443,7 +5443,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -5524,7 +5524,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/26.xml</filepath>
 				</data>
@@ -5566,7 +5566,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/26.xml</filepath>
 				</data>
@@ -5592,7 +5592,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/27.xml</filepath>
 				</data>
@@ -5675,7 +5675,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/26.xml</filepath>
 				</data>
@@ -5771,7 +5771,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -5792,7 +5792,7 @@
 			<description>add addressbook - test last sync</description>
 			<!-- share user3 address book with user1 -->
 			<!-- user3 POSTs invitation -->
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$addressbookpath3:/</ruri>
 				<data>
@@ -5802,11 +5802,11 @@
 			</request>
 
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -5816,7 +5816,7 @@
 			</request>
 
 			<!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -5893,7 +5893,7 @@
 
 			<!-- share user3 address book with user1 -->
 			<!-- user3 POSTs invitation -->
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$addressbookpath3:/</ruri>
 				<data>
@@ -5903,11 +5903,11 @@
 			</request>
 
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -5917,7 +5917,7 @@
 			</request>
 
 			<!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -5950,7 +5950,7 @@
 
 			<!-- share user4 address book with user1 -->
 			<!-- user4 POSTs invitation -->
-			<request user="$userid4:" pswd="$pswd4:" print-response="no">
+			<request user="$userid4:" pswd="$pswd4:">
 				<method>POST</method>
 				<ruri>$addressbookpath4:/</ruri>
 				<data>
@@ -5960,11 +5960,11 @@
 			</request>
 
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -5974,7 +5974,7 @@
 			</request>
 
 			<!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -6053,7 +6053,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/32.xml</filepath>
 				</data>
@@ -6086,7 +6086,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/32.xml</filepath>
 				</data>
@@ -6108,7 +6108,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/33.xml</filepath>
 				</data>
@@ -6171,7 +6171,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/32.xml</filepath>
 				</data>
@@ -6246,7 +6246,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/35.xml</filepath>
 				</data>
@@ -6287,7 +6287,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/35.xml</filepath>
 				</data>
@@ -6309,7 +6309,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/36.xml</filepath>
 				</data>
@@ -6387,7 +6387,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/35.xml</filepath>
 				</data>
@@ -6472,7 +6472,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/32.xml</filepath>
 				</data>
@@ -6493,7 +6493,7 @@
 			<description>add addressbook - test last sync</description>
 			<!-- share user3 address book with user1 -->
 			<!-- user3 POSTs invitation -->
-			<request user="$userid3:" pswd="$pswd3:" print-response="no">
+			<request user="$userid3:" pswd="$pswd3:">
 				<method>POST</method>
 				<ruri>$addressbookpath3:/</ruri>
 				<data>
@@ -6503,11 +6503,11 @@
 			</request>
 
 			<!-- Check user1 notification collection and get invite uid -->
-			<request print-response="no">
+			<request>
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<grabelement>
@@ -6517,7 +6517,7 @@
 			</request>
 
 			<!-- user1 replies ACCEPTED and deletes inviteUID from notification collection -->
-			<request print-response="no">
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<data substitutions="yes">
@@ -6538,7 +6538,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/33.xml</filepath>
 				</data>
@@ -6560,7 +6560,7 @@
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/32.xml</filepath>
 				</data>
@@ -6656,7 +6656,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -6700,7 +6700,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/23.xml</filepath>
 				</data>
@@ -6778,7 +6778,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/32.xml</filepath>
 				</data>
@@ -6822,7 +6822,7 @@
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/sync/addressbook/32.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sharing-unshare.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -36,10 +36,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='share addressbook, sharee decline' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='share addressbook, sharee decline'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -53,11 +53,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -77,7 +77,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -87,10 +87,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -111,9 +111,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -143,7 +143,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -166,12 +166,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee replies DECLINED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/unshare/shareedecline/2.xml</filepath>
 				</data>
@@ -180,9 +180,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -208,7 +208,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -233,10 +233,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='reshare addressbook, sharee delete' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='reshare addressbook, sharee delete'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -250,11 +250,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -274,7 +274,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -284,10 +284,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -308,9 +308,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -340,7 +340,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -363,9 +363,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee deletes shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -377,9 +377,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -405,7 +405,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -430,13 +430,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='reshare addressbook, sharee delete addressbook group' ignore='no'>
+	<test-suite name='reshare addressbook, sharee delete addressbook group'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -450,11 +450,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -474,7 +474,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -484,10 +484,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -508,9 +508,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -540,7 +540,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -563,9 +563,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee deletes shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$shareeaddressbook:/addressbook.vcf</ruri>
 				<verify>
@@ -573,9 +573,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -601,7 +601,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -626,10 +626,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='reshare addressbook, sharer uninvite' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='reshare addressbook, sharer uninvite'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -643,11 +643,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -667,7 +667,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -677,10 +677,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -701,9 +701,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -733,7 +733,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -756,9 +756,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>POST uninvitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -770,9 +770,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -794,11 +794,11 @@
 		</test>
 		<test name='8'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -818,7 +818,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -828,10 +828,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='reshare addressbook, sharer delete' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='reshare addressbook, sharer delete'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<data>
@@ -845,11 +845,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -869,7 +869,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -879,10 +879,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/3.xml</filepath>
 				</data>
@@ -903,9 +903,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -935,7 +935,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -958,9 +958,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>sharer deletes address book</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<verify>
@@ -968,9 +968,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareeaddressbook:/</ruri>
 				<header>
@@ -992,11 +992,11 @@
 		</test>
 		<test name='8'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -1016,7 +1016,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -1026,11 +1026,11 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='create and share group, sharee decline' ignore='no'>
+	<test-suite name='create and share group, sharee decline'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<description>cleanup and initialize</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -1073,9 +1073,9 @@
 			</request>
 		</test>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<data>
@@ -1089,11 +1089,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -1113,7 +1113,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -1123,10 +1123,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/13.xml</filepath>
 				</data>
@@ -1147,9 +1147,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<header>
@@ -1179,7 +1179,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1202,12 +1202,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee replies DECLINED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/unshare/shareedecline/4.xml</filepath>
 				</data>
@@ -1216,9 +1216,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -1244,7 +1244,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1269,13 +1269,13 @@
 		</test>
 	</test-suite>	
 
-	<test-suite name='reshare group, sharee delete addressbook' ignore='no'>
+	<test-suite name='reshare group, sharee delete addressbook'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<data>
@@ -1289,11 +1289,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -1313,7 +1313,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -1323,10 +1323,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/13.xml</filepath>
 				</data>
@@ -1347,9 +1347,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<header>
@@ -1379,7 +1379,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1402,9 +1402,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee deletes shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -1416,9 +1416,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -1444,7 +1444,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1469,13 +1469,13 @@
 		</test>
 	</test-suite>	
 
-	<test-suite name='reshare group, sharee delete group' ignore='no'>
+	<test-suite name='reshare group, sharee delete group'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<data>
@@ -1489,11 +1489,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -1513,7 +1513,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -1523,10 +1523,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/13.xml</filepath>
 				</data>
@@ -1547,9 +1547,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<header>
@@ -1579,7 +1579,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1602,9 +1602,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee deletes shared group</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$shareegroup:</ruri>
 				<header>
@@ -1616,9 +1616,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -1644,7 +1644,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1669,13 +1669,13 @@
 		</test>
 	</test-suite>	
 
-	<test-suite name='reshare group, sharer uninvite' ignore='no'>
+	<test-suite name='reshare group, sharer uninvite'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<data>
@@ -1689,11 +1689,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -1713,7 +1713,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -1723,10 +1723,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/13.xml</filepath>
 				</data>
@@ -1747,9 +1747,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<header>
@@ -1779,7 +1779,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1802,12 +1802,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sharee replies DECLINED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/unshare/shareedecline/4.xml</filepath>
 				</data>
@@ -1816,9 +1816,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -1844,7 +1844,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -1869,13 +1869,13 @@
 		</test>
 	</test-suite>	
 
-	<test-suite name='reshare group, sharer delete group' ignore='no'>
+	<test-suite name='reshare group, sharer delete group'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<data>
@@ -1889,11 +1889,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -1913,7 +1913,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -1923,10 +1923,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/13.xml</filepath>
 				</data>
@@ -1947,9 +1947,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<header>
@@ -1979,7 +1979,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -2002,9 +2002,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>sharer deletes address book</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<verify>
@@ -2012,9 +2012,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -2036,11 +2036,11 @@
 		</test>
 		<test name='8'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -2060,7 +2060,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -2070,11 +2070,11 @@
 		</test>
 	</test-suite>	
 
-	<test-suite name='recreate and share group, sharer delete addressbook' ignore='no'>
+	<test-suite name='recreate and share group, sharer delete addressbook'>
 		<require-feature>
 			<feature>shared-groups</feature>
 		</require-feature>
-		<test name='0' ignore='no'>
+		<test name='0'>
 			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
@@ -2085,9 +2085,9 @@
 			</request>
 		</test>
 
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<data>
@@ -2101,11 +2101,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -2125,7 +2125,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>
@@ -2135,10 +2135,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$addressbookhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/sharing/setup/13.xml</filepath>
 				</data>
@@ -2159,9 +2159,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$addressbookpath1:/g123.vcf</ruri>
 				<header>
@@ -2191,7 +2191,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -2214,9 +2214,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>sharer deletes address book</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<verify>
@@ -2224,9 +2224,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>No more shared addressbook</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$addressbookhome2:/$userguid1:/</ruri>
 				<header>
@@ -2248,11 +2248,11 @@
 		</test>
 		<test name='8'>
 			<description>Check Sharee notification collection</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath2:/</ruri>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>GETNEW</method>
 				<ruri>$notificationpath2:/</ruri>
 				<verify>
@@ -2272,7 +2272,7 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>DELETE</method>
 				<ruri>$notificationpath2:/$inviteuid:</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/sync-report.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -25,7 +25,7 @@
 	</require-feature>
 
 	<start>
-		<request print-response='no'>
+		<request>
 			<method>DELETE</method>
 			<ruri>$addressbookpath1:/</ruri>
 		</request>
@@ -47,8 +47,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='support-report-set' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='support-report-set'>
+		<test name='1'>
 			<description>Not on addressbooks</description>
 			<request>
 				<method>PROPFIND</method>
@@ -81,7 +81,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>On addressbook-home</description>
 			<request>
 				<method>PROPFIND</method>
@@ -142,7 +142,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>On addressbook</description>
 			<request>
 				<method>PROPFIND</method>
@@ -175,10 +175,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='simple reports - empty token - no props' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - empty token - no props'>
+		<test name='1'>
 			<description>initial query - addressbook depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -199,12 +199,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -224,12 +224,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -251,7 +251,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>add new resource</description>
 			<request>
 				<method>PUT</method>
@@ -265,9 +265,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>new resource - addressbook depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -289,12 +289,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>new resource - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -314,12 +314,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>new resource - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -342,7 +342,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>remove new resource</description>
 			<request>
 				<method>DELETE</method>
@@ -352,9 +352,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>remove new resource - addressbook depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -375,12 +375,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>remove new resource - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -400,12 +400,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>remove new resource - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -427,7 +427,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -441,9 +441,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>changed resource - addressbook depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -464,12 +464,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>changed resource - home depth:1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -489,12 +489,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>changed resource - home depth:infinity</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -518,10 +518,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - no props' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - diff token - no props'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -546,7 +546,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -559,14 +559,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/3.xml</filepath>
 				</data>
@@ -583,7 +583,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -592,14 +592,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/3.xml</filepath>
 				</data>
@@ -612,16 +612,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/4.xml</filepath>
 				</data>
@@ -638,7 +638,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -651,7 +651,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -675,16 +675,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/3.xml</filepath>
 				</data>
@@ -699,10 +699,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - empty token - props' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - empty token - props'>
+		<test name='1'>
 			<description>initial query</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -731,7 +731,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -744,7 +744,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -774,7 +774,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource new resource</description>
 			<request>
 				<method>DELETE</method>
@@ -783,7 +783,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -812,7 +812,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -825,7 +825,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -856,10 +856,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - props' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='simple reports - diff token - props'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -892,7 +892,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -905,14 +905,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/6.xml</filepath>
 				</data>
@@ -937,7 +937,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -946,14 +946,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/6.xml</filepath>
 				</data>
@@ -966,16 +966,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/7.xml</filepath>
 				</data>
@@ -995,7 +995,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -1008,7 +1008,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
@@ -1040,16 +1040,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/6.xml</filepath>
 				</data>
@@ -1072,13 +1072,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - no props - home depth:infinity' ignore='no'>
+	<test-suite name='simple reports - diff token - no props - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initialize</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$addressbookpath1:/</ruri>
 			</request>
@@ -1099,9 +1099,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -1127,7 +1127,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -1140,14 +1140,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/3.xml</filepath>
 				</data>
@@ -1165,7 +1165,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -1174,14 +1174,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/3.xml</filepath>
 				</data>
@@ -1198,16 +1198,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/4.xml</filepath>
 				</data>
@@ -1228,7 +1228,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -1241,7 +1241,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -1266,16 +1266,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/3.xml</filepath>
 				</data>
@@ -1290,13 +1290,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='simple reports - diff token - props - home depth:infinity' ignore='no'>
+	<test-suite name='simple reports - diff token - props - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -1330,7 +1330,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
 			<request>
 				<method>PUT</method>
@@ -1343,14 +1343,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/6.xml</filepath>
 				</data>
@@ -1376,7 +1376,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>remove resource (treated as new)</description>
 			<request>
 				<method>DELETE</method>
@@ -1385,14 +1385,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/6.xml</filepath>
 				</data>
@@ -1428,16 +1428,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>remove resource (treated as old)</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/7.xml</filepath>
 				</data>
@@ -1465,7 +1465,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>changed resource</description>
 			<request>
 				<method>PUT</method>
@@ -1478,7 +1478,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -1511,16 +1511,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>no change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/6.xml</filepath>
 				</data>
@@ -1547,9 +1547,9 @@
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -1579,7 +1579,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>remove resource then addressbook</description>
 			<request>
 				<method>DELETE</method>
@@ -1595,14 +1595,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>infinity</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CardDAV/vreports/sync/3.xml</filepath>
 				</data>
@@ -1619,7 +1619,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>add addressbook - test last sync</description>
 			<request end-delete="yes">
 				<method>MKCOL</method>
@@ -1629,7 +1629,7 @@
 					<filepath>Resource/Common/MKCOL/addressbook.xml</filepath>
 				</data>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>
@@ -1649,9 +1649,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>add addressbook - test previous sync</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$addressbookhome1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/calendaruserproxy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -48,7 +48,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='Proxy on podB' ignore="no">
+	<test-suite name='Proxy on podB'>
 		<test name='1'>
 			<description>Verify no group memberships right now</description>
 			<request>
@@ -549,7 +549,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Proxy on podB - requests from podB' ignore="no">
+	<test-suite name='Proxy on podB - requests from podB'>
 		<test name='1'>
 			<description>Verify no group memberships right now</description>
 			<request host2='yes'>
@@ -1050,7 +1050,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Proxy on podA' ignore="no">
+	<test-suite name='Proxy on podA'>
 		<test name='1'>
 			<description>Verify no group memberships right now</description>
 			<request user="$puserid1:" pswd="$ppswd1:">
@@ -1551,7 +1551,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Proxy on podA - requests from podB' ignore="no">
+	<test-suite name='Proxy on podA - requests from podB'>
 		<test name='1'>
 			<description>Verify no group memberships right now</description>
 			<request host2='yes' user="$puserid1:" pswd="$ppswd1:">

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitproxy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -135,14 +135,14 @@
 	<test-suite name='Proxy as Attendee'>
 		<test name='2'>
 			<description>Proxy updates event</description>
-			<request host2='yes' user='$puserid1:' pswd='$ppswd1:' print-response='no'>
+			<request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
 				<method>GETNEW</method>
 				<ruri>$calendarpath3:/</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request host2='yes' user='$puserid1:' pswd='$ppswd1:' print-response='no'>
+			<request host2='yes' user='$puserid1:' pswd='$ppswd1:'>
 				<method>PUT</method>
 				<ruri>$</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/implicitsimple.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -36,7 +36,7 @@
 		</request>
 	</start>
 	
-	<test-suite name='#1 scheduling across nodes' ignore='no'>
+	<test-suite name='#1 scheduling across nodes'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
 			<request>
@@ -271,7 +271,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='#2 scheduling across nodes - from podB' ignore='no'>
+	<test-suite name='#2 scheduling across nodes - from podB'>
 		<test name='1'>
 			<description>Organizer invites Attendees</description>
 			<request host2='yes'>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-cache.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,8 +37,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='Generate invite' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Generate invite'>
+		<test name='1'>
 			<description>Create</description>
 			<request end-delete="yes">
 				<method>MKCALENDAR</method>
@@ -48,9 +48,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND Home to cache it</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -70,9 +70,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -84,9 +84,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>PROPFIND Home check</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -106,9 +106,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>POST uninvite</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -120,9 +120,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PROPFIND Home check</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -145,9 +145,9 @@
 	</test-suite>
 
 	<test-suite name='Send first reply'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -161,11 +161,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -186,9 +186,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPFIND Home check</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -206,10 +206,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -230,9 +230,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PROPFIND Home check</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -260,9 +260,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Delete shared</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar:/</ruri>
 				<verify>
@@ -270,9 +270,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PROPFIND Home check</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -302,10 +302,10 @@
 		</test>
 		<test name='8'>
 			<description>Sharee replies ACCEPTED - need to do this cycle of accept/delete twice to regress properly</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -326,9 +326,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>PROPFIND Home check</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -356,9 +356,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Delete shared</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar:/</ruri>
 				<verify>
@@ -366,9 +366,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>PROPFIND Home check</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-calendars.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-calendars.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-calendars.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -53,7 +53,7 @@
 	</start>
 	
 	<test-suite name='Read-write calendar'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request>
 				<method>POST</method>
@@ -99,7 +99,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -359,7 +359,7 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Default calendar cannot be shared calendar' ignore='no'>
+	<test-suite name='Default calendar cannot be shared calendar'>
 		<test name='1'>
 			<description>Set property on Inbox</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
@@ -380,7 +380,7 @@
 		</test>
 		<test name='2'>
 			<description>Verify property on inbox</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pinboxpath2:/</ruri>
 				<header>
@@ -402,8 +402,8 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Change to read-only calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Change to read-only calendar'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request>
 				<method>POST</method>
@@ -449,7 +449,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-create.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-create.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-create.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -37,8 +37,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='Create calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Create calendar'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request end-delete="yes">
 				<method>MKCALENDAR</method>
@@ -48,9 +48,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Change the color</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -68,10 +68,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Generate invite' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Generate invite'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -85,11 +85,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -112,10 +112,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Accept' ignore='no'>
+	<test-suite name='Accept'>
 		<test name='1'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -126,10 +126,10 @@
 					<variable>$inviteuid2:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -142,9 +142,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -166,7 +166,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -184,7 +184,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared calendar exists without color</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-direct.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -42,7 +42,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -73,7 +73,7 @@
 		</test>
 		<test name='2'>
 			<description>Sharee does direct share</description>
-			<request user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -87,7 +87,7 @@
 		</test>
 		<test name='3'>
 			<description>Shared calendar exists</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -120,7 +120,7 @@
 		</test>
 		<test name='4'>
 			<description>Original calendar unchanged</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -143,7 +143,7 @@
 		</test>
 		<test name='5'>
 			<description>Sharee creates event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/1.ics</ruri>
 				<data>
@@ -157,7 +157,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharer sees event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<verify>
@@ -171,7 +171,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharer changes event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -185,7 +185,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharee sees changed event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/1.ics</ruri>
 				<verify>
@@ -199,7 +199,7 @@
 		</test>
 		<test name='9'>
 			<description>Sharer creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<data>
@@ -213,7 +213,7 @@
 		</test>
 		<test name='10'>
 			<description>Sharee sees new event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/2.ics</ruri>
 				<verify>
@@ -227,7 +227,7 @@
 		</test>
 		<test name='11'>
 			<description>Sharee changes event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/2.ics</ruri>
 				<data>
@@ -241,7 +241,7 @@
 		</test>
 		<test name='12'>
 			<description>Sharer sees changed event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<verify>
@@ -255,7 +255,7 @@
 		</test>
 		<test name='13'>
 			<description>Sharee does direct share again</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -269,7 +269,7 @@
 		</test>
 		<test name='14'>
 			<description>Shared calendar exists</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -341,7 +341,7 @@
 		</test>
 		<test name='3'>
 			<description>Shared calendar exists</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -373,7 +373,7 @@
 		</test>
 		<test name='4'>
 			<description>Create event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/3.ics</ruri>
 				<data>
@@ -391,7 +391,7 @@
 		</test>
 		<test name='5'>
 			<description>Sharer creates event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/4.ics</ruri>
 				<data>
@@ -405,7 +405,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharee sees new event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar:/4.ics</ruri>
 				<verify>
@@ -419,7 +419,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee cannot change event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar:/4.ics</ruri>
 				<data>
@@ -450,7 +450,7 @@
 		</test>
 		<test name='2'>
 			<description>Shared calendar does not exist</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -472,7 +472,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharer calendar does exist</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -515,7 +515,7 @@
 		</test>
 		<test name='2'>
 			<description>Sharee does direct share</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/?action=share</ruri>
 				<verify>
@@ -550,7 +550,7 @@
 		</test>
 		<test name='2'>
 			<description>Sharee does direct share</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$calendarhomealt1:/shared/?action=share</ruri>
 				<verify>
@@ -564,7 +564,7 @@
 		</test>
 		<test name='3'>
 			<description>Shared calendar exists</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>
@@ -597,7 +597,7 @@
 		</test>
 		<test name='4'>
 			<description>Sharee creates event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/9.ics</ruri>
 				<data>
@@ -611,7 +611,7 @@
 		</test>
 		<test name='5'>
 			<description>Sharer sees event</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/9.ics</ruri>
 				<verify>
@@ -692,7 +692,7 @@
 		</test>
 		<test name='3'>
 			<description>Sharee does direct share</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$calendarhomealt1:/shared/?action=share</ruri>
 				<verify>
@@ -706,7 +706,7 @@
 		</test>
 		<test name='4'>
 			<description>Shared calendar exists with color</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-dropbox.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -50,9 +50,9 @@
 	</start>
 	
 	<test-suite name='Setup two sharees'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>POST</method>
 				<ruri>$calendarhome2:/shared/</ruri>
 				<data>
@@ -66,11 +66,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee 2 notification collection</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath3:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath3:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee 2 replies ACCEPTED</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>POST</method>
 				<ruri>$pcalendarhome3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply23-pod.xml</filepath>
 				</data>
@@ -106,11 +106,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee 3 notification collection</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath4:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath4:/</ruri>
 				<verify>
@@ -128,10 +128,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee 3 replies ACCEPTED</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>POST</method>
 				<ruri>$pcalendarhome4:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply24-pod.xml</filepath>
 				</data>
@@ -161,7 +161,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='PUT by User 2' ignore='no'>
+	<test-suite name='PUT by User 2'>
 		<test name='1'>
 			<description>PUT event by user 2</description>
 			<request user="$userid2:" pswd="$pswd2:">
@@ -190,9 +190,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Attachment exists for User 2</description>
-			<request user="$userid2:" pswd="$pswd2:" print-response='no'>
+			<request user="$userid2:" pswd="$pswd2:">
 				<method>PROPFIND</method>
 				<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
 				<header>
@@ -212,9 +212,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Attachment exists for User 3</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PROPFIND</method>
 				<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
 				<header>
@@ -248,9 +248,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Attachments exists for User 4</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>PROPFIND</method>
 				<ruri>$dropboxpath2:/54E181BC7CCC373042B28842/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-freebusy.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-freebusy.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-freebusy.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -61,7 +61,7 @@
 		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>POST</method>
 			<ruri>$pcalendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 			</data>
@@ -89,7 +89,7 @@
 		<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 			<method>POST</method>
 			<ruri>$pcalendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3-pod.xml</filepath>
 			</data>
@@ -127,10 +127,10 @@
 	<test-suite name='Initial event'>
 		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/1.ics</filepath>
 				</data>
@@ -141,7 +141,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/3.ics</filepath>
 				</data>
@@ -182,10 +182,10 @@
 		</test>
 		<test name='3'>
 			<description>User02 freebusy</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$poutboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/4.ics</filepath>
 				</data>
@@ -226,10 +226,10 @@
 		</test>
 		<test name='4'>
 			<description>User03 freebusy</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>POST</method>
 				<ruri>$poutboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/5.ics</filepath>
 				</data>
@@ -273,10 +273,10 @@
 	<test-suite name='Changed event'>
 		<test name='1'>
 			<description>User02 store to shared</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/2.ics</filepath>
 				</data>
@@ -287,7 +287,7 @@
 			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/3.ics</filepath>
 				</data>
@@ -324,10 +324,10 @@
 		</test>
 		<test name='3'>
 			<description>User02 freebusy</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$poutboxpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/4.ics</filepath>
 				</data>
@@ -364,10 +364,10 @@
 		</test>
 		<test name='4'>
 			<description>User03 freebusy</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>POST</method>
 				<ruri>$poutboxpath3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/freebusy/5.ics</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-invites.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-invites.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-invites.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -59,9 +59,9 @@
 	</start>
 	
 	<test-suite name='Send new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -75,11 +75,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -98,7 +98,7 @@
 		</test>
 		<test name='3'>
 			<description>Notification type property</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -121,9 +121,9 @@
 	</test-suite>
 	
 	<test-suite name='Update new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -137,11 +137,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -160,7 +160,7 @@
 		</test>
 		<test name='3'>
 			<description>Notification type property</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$</ruri>
 				<header>
@@ -183,9 +183,9 @@
 	</test-suite>
 	
 	<test-suite name='Uninvite new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -199,7 +199,7 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
@@ -222,9 +222,9 @@
 	</test-suite>
 	
 	<test-suite name='Attempt broken invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -246,7 +246,7 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
@@ -269,9 +269,9 @@
 	</test-suite>
 	
 	<test-suite name='Delete new invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -285,7 +285,7 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
@@ -305,9 +305,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>DELETE collection</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>
@@ -317,7 +317,7 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
@@ -340,7 +340,7 @@
 	</test-suite>
 	
 	<test-suite name='Uninvite invalid invite'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request end-delete="yes">
 				<method>MKCALENDAR</method>
@@ -350,9 +350,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST valid invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -364,9 +364,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST single invalid uninvitate</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -378,9 +378,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST invalid and valid uninvitate</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -400,9 +400,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>DELETE collection</description>
-			<request print-response='no'>
+			<request>
 				<method>DELETE</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>
@@ -413,9 +413,9 @@
 	</test-suite>
 
 	<test-suite name='Double invites'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation #2</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -429,11 +429,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -454,13 +454,13 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST invitation #3</description>
-			<request print-response='no'>
+			<request>
 				<method>DELAY</method>
 				<ruri>1</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared3/</ruri>
 				<data>
@@ -474,11 +474,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 2</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -497,10 +497,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED #2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -523,7 +523,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharee deletes shared calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar2:/</ruri>
 				<verify>
@@ -531,9 +531,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Remove invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -545,9 +545,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Remove invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared3/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-managed-attachments.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-managed-attachments.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-managed-attachments.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -63,7 +63,7 @@
 		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>POST</method>
 			<ruri>$pcalendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 			</data>
@@ -91,7 +91,7 @@
 		<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 			<method>POST</method>
 			<ruri>$pcalendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3-pod.xml</filepath>
 			</data>
@@ -1334,7 +1334,7 @@
 	<test-suite name='Direct share'>
 		<test name='1'>
 			<description>Add user02 as read write for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -1352,7 +1352,7 @@
 		</test>
 		<test name='2'>
 			<description>Add user03 as read write for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>
@@ -1672,7 +1672,7 @@
 		</test>
 		<test name='16'>
 			<description>Clear user02 as read-write proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-write/</ruri>
 				<data>
@@ -1690,7 +1690,7 @@
 		</test>
 		<test name='17'>
 			<description>Clear user03 as read-only proxy for user01</description>
-			<request print-response="no">
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$principal1:calendar-proxy-read/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-moves.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,7 +31,7 @@
 			<method>MKCALENDAR</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>POST</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -42,11 +42,11 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$pnotificationpath2:/</ruri>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>GETNEW</method>
 			<ruri>$pnotificationpath2:/</ruri>
 			<grabelement>
@@ -58,10 +58,10 @@
 				<variable>$hosturl2:</variable>
 			</grabelement>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>POST</method>
 			<ruri>$pcalendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 			</data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-multiple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-multiple.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-multiple.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -52,9 +52,9 @@
 	</start>
 	
 	<test-suite name='Send new invite #1'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial collection count</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -71,9 +71,9 @@
 				<grabcount>$calendarhome2count:</grabcount>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared1/</ruri>
 				<data>
@@ -87,11 +87,11 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -109,10 +109,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -125,9 +125,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One more calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -147,9 +147,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One more calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar1:/</ruri>
 				<header>
@@ -172,9 +172,9 @@
 	</test-suite>
 	
 	<test-suite name='Send new invite #2'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial collection count</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -191,9 +191,9 @@
 				<grabcount>$calendarhome2count:</grabcount>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -207,11 +207,11 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 2</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -229,10 +229,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -245,9 +245,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One more calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -267,9 +267,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>One more calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>
@@ -292,9 +292,9 @@
 	</test-suite>
 	
 	<test-suite name='Uninvite #2'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial collection count</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -311,9 +311,9 @@
 				<grabcount>$calendarhome2count:</grabcount>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared2/</ruri>
 				<data>
@@ -327,7 +327,7 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
@@ -347,9 +347,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>One less calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -369,9 +369,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>One less calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<header>
@@ -391,9 +391,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Existing calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar1:/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-notification-sync.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -43,7 +43,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -53,10 +53,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='initial tokens - depth 1' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='initial tokens - depth 1'>
+		<test name='1'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$notificationpath1:/</ruri>
 				<header>
@@ -80,9 +80,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
@@ -108,10 +108,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Read-write calendar - depth 1' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Read-write calendar - depth 1'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -123,20 +123,20 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -159,21 +159,21 @@
 		</test>
 		<test name='3'>
 			<description>Remove notification</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>new resource</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -196,13 +196,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='initial tokens - depth infinity' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='initial tokens - depth infinity'>
+		<test name='1'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -234,12 +234,12 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<require-feature>
 				<feature>sync-report-home</feature>
 			</require-feature>
 			<description>initial query - grab token</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -276,9 +276,9 @@
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -290,13 +290,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -317,14 +317,14 @@
 					<variable>$inviteuid2:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -343,21 +343,21 @@
 		</test>
 		<test name='3'>
 			<description>Remove notification</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>deleted resource</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -380,10 +380,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -396,16 +396,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>new calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -428,7 +428,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharee removes calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<verify>
@@ -436,16 +436,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>removed calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -472,9 +472,9 @@
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -486,13 +486,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>new resource</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -513,14 +513,14 @@
 					<variable>$inviteuid:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -539,21 +539,21 @@
 		</test>
 		<test name='3'>
 			<description>Remove notification</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>deleted resource</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -576,10 +576,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -592,16 +592,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>new calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -622,9 +622,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -635,14 +635,14 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -654,21 +654,21 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>removed calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -693,16 +693,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>no calendar change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -735,9 +735,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -749,13 +749,13 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>new resource</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<grabelement>
@@ -766,18 +766,18 @@
 		</test>
 		<test name='4'>
 			<description>Remove notification</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -792,10 +792,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -808,16 +808,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>new calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -838,16 +838,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Grab sharer's sync token'</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-infinite.xml</filepath>
 				</data>
@@ -874,16 +874,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -901,16 +901,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Sharee change</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -945,16 +945,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -972,16 +972,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Sharee change</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1012,16 +1012,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1042,16 +1042,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>Sharee change</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1082,16 +1082,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>Sharer change</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1112,16 +1112,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='19' ignore='no'>
+		<test name='19'>
 			<description>Sharee change</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1144,7 +1144,7 @@
 		</test>
 		<test name='20'>
 			<description>Sharee removes calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETE</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<verify>
@@ -1152,16 +1152,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='21'>
 			<description>removed calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1184,20 +1184,20 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Response cache' ignore='no'>
+	<test-suite name='Response cache'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PROPFIND of current sync-token - direct</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1210,16 +1210,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPFIND of home</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1232,16 +1232,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPFIND of home again - to cache it</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1254,9 +1254,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -1268,16 +1268,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>PROPFIND of home - token changed</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1290,16 +1290,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>PROPFIND of new sync-token - direct</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1312,16 +1312,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>PROPFIND of home</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1338,16 +1338,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>PROPFIND of home again - to cache it</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>
@@ -1366,21 +1366,21 @@
 		</test>
 		<test name='9'>
 			<description>Remove notification</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>PROPFIND of home - token changed</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/PROPFIND/sync-token.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-data.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-data.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-data.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -31,7 +31,7 @@
 			<method>MKCALENDAR</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>POST</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -42,11 +42,11 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$pnotificationpath2:/</ruri>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>GETNEW</method>
 			<ruri>$pnotificationpath2:/</ruri>
 			<grabelement>
@@ -58,10 +58,10 @@
 				<variable>$hosturl2:</variable>
 			</grabelement>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>POST</method>
 			<ruri>$pcalendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 			</data>
@@ -70,11 +70,11 @@
 				<variable>$sharedcalendar2:</variable>
 			</grabelement>
 		</request>
-		<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+		<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 			<method>WAITCOUNT 1</method>
 			<ruri>$pnotificationpath3:/</ruri>
 		</request>
-		<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+		<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 			<method>GETNEW</method>
 			<ruri>$pnotificationpath3:/</ruri>
 			<grabelement>
@@ -86,10 +86,10 @@
 				<variable>$hosturl3:</variable>
 			</grabelement>
 		</request>
-		<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+		<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 			<method>POST</method>
 			<ruri>$pcalendarhome3:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply3-pod.xml</filepath>
 			</data>
@@ -100,10 +100,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Initial event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Initial event'>
+		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -112,9 +112,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 sees event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
 				<verify>
@@ -126,9 +126,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/1.ics</ruri>
 				<verify>
@@ -142,10 +142,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User01 changed event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User01 changed event'>
+		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -154,9 +154,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 sees event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
 				<verify>
@@ -168,9 +168,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/1.ics</ruri>
 				<verify>
@@ -184,10 +184,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User02 changed event' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User02 changed event'>
+		<test name='1'>
 			<description>User02 store to shared</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/1.ics</ruri>
 				<data>
@@ -196,9 +196,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 sees event</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<verify>
@@ -210,9 +210,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/1.ics</ruri>
 				<verify>
@@ -226,10 +226,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Different freebusy' ignore='no'>
+	<test-suite name='Different freebusy'>
 		<test name='1'>
 			<description>Set properties on new calendars</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -244,7 +244,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar2:/</ruri>
 				<data>
@@ -259,7 +259,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar3:/</ruri>
 				<data>
@@ -275,9 +275,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 freebusy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -315,9 +315,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User02 freebusy</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$poutboxpath2:/</ruri>
 				<data>
@@ -355,9 +355,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>User03 freebusy</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>POST</method>
 				<ruri>$poutboxpath3:/</ruri>
 				<data>
@@ -397,10 +397,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User01 complex recurring store' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User01 complex recurring store'>
+		<test name='1'>
 			<description>User01 store to shared</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<data>
@@ -409,9 +409,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 sees event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$sharedcalendar2:/2.ics</ruri>
 				<verify>
@@ -423,9 +423,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/2.ics</ruri>
 				<verify>
@@ -439,10 +439,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='User02 complex recurring store' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='User02 complex recurring store'>
+		<test name='1'>
 			<description>User02 store to shared</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$sharedcalendar2:/2.ics</ruri>
 				<data>
@@ -451,9 +451,9 @@
 				</data>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 sees event</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<verify>
@@ -465,9 +465,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 sees event</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GET</method>
 				<ruri>$sharedcalendar3:/2.ics</ruri>
 				<verify>
@@ -481,10 +481,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Complex freebusy' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Complex freebusy'>
+		<test name='1'>
 			<description>User01 freebusy</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$outboxpath1:/</ruri>
 				<data>
@@ -535,9 +535,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User02 freebusy</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$poutboxpath2:/</ruri>
 				<data>
@@ -588,9 +588,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User03 freebusy</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response="no">
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>POST</method>
 				<ruri>$poutboxpath3:/</ruri>
 				<data>
@@ -643,10 +643,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Prevent per-user data injection' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Prevent per-user data injection'>
+		<test name='1'>
 			<description>User01 new event with injected per-user data</description>
-			<request user="$userid1:" pswd="$pswd1:" end-delete="yes" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:" end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1.ics</ruri>
 				<data>
@@ -662,9 +662,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>User01 new event with valid data</description>
-			<request user="$userid1:" pswd="$pswd1:" end-delete="yes" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:" end-delete="yes">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>
@@ -676,9 +676,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>User01 existing event with injected per-user data</description>
-			<request user="$userid1:" pswd="$pswd1:" print-response="no">
+			<request user="$userid1:" pswd="$pswd1:">
 				<method>PUT</method>
 				<ruri>$calendarpath1:/2.ics</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-properties.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-properties.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-peruser-properties.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -45,9 +45,9 @@
 	</start>
 	
 	<test-suite name='Read-write calendar'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>PROPPATCH of displayname before share</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -62,7 +62,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -82,9 +82,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPPATCH of calendar-description before share</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPPATCH</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -99,7 +99,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -119,9 +119,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -135,11 +135,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -162,10 +162,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -180,7 +180,7 @@
 		</test>
 		<test name='6'>
 			<description>Shared calendar exists</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -212,10 +212,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='prop patches - non-global' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches - non-global'>
+		<test name='1'>
 			<description>PROPFIND of shared displayname</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -235,9 +235,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPPATCH of displayname</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<data>
@@ -252,7 +252,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -272,9 +272,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPFIND of shared displayname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -296,10 +296,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='prop patches - shadowable' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='prop patches - shadowable'>
+		<test name='1'>
 			<description>PROPFIND of shared calendar-description</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -319,9 +319,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>PROPPATCH of calendar-description</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<data>
@@ -336,7 +336,7 @@
 					</arg>
 				</verify>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$sharedcalendar:/</ruri>
 				<header>
@@ -356,9 +356,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>PROPFIND of shared calendar-description</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-propfind.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-propfind.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-propfind.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -83,7 +83,7 @@
 	</start>
 	
 	<test-suite name='Set up share'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request>
 				<method>POST</method>
@@ -120,7 +120,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-proxies.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -53,10 +53,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Setup proxies' ignore="no">
+	<test-suite name='Setup proxies'>
 		<test name='1'>
 			<description>Add user03 as read proxy for user02</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$pprincipal2:calendar-proxy-read/</ruri>
 				<data>
@@ -74,7 +74,7 @@
 		</test>
 		<test name='2'>
 			<description>Add user04 as write proxy for user02</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
 				<ruri>$pprincipal2:calendar-proxy-write/</ruri>
 				<data>
@@ -93,9 +93,9 @@
 	</test-suite>
 
 	<test-suite name='Set up share'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -109,11 +109,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -136,10 +136,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -160,9 +160,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -192,7 +192,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -210,7 +210,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharer adds event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -227,7 +227,7 @@
 	<test-suite name='Proxies see calendar and contents'>
 		<test name='1'>
 			<description>Read proxy lists calendar home</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -257,7 +257,7 @@
 		</test>
 		<test name='2'>
 			<description>Write proxy lists calendar home</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>PROPFIND</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -287,7 +287,7 @@
 		</test>
 		<test name='3'>
 			<description>Read proxy lists calendar</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -309,7 +309,7 @@
 		</test>
 		<test name='4'>
 			<description>Write proxy lists calendar</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -334,7 +334,7 @@
 	<test-suite name='Proxy data changes'>
 		<test name='1'>
 			<description>Read proxy cannot write new data</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PUT</method>
 				<ruri>$shareecalendar:/2.ics</ruri>
 				<data>
@@ -352,7 +352,7 @@
 		</test>
 		<test name='2'>
 			<description>Read proxy cannot write existing data</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PUT</method>
 				<ruri>$shareecalendar:/1.ics</ruri>
 				<data>
@@ -370,7 +370,7 @@
 		</test>
 		<test name='3'>
 			<description>Write proxy can write new data</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>PUT</method>
 				<ruri>$shareecalendar:/2.ics</ruri>
 				<data>
@@ -384,7 +384,7 @@
 		</test>
 		<test name='4'>
 			<description>Sharer sees new data</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/2.ics</ruri>
 				<verify>
@@ -398,7 +398,7 @@
 		</test>
 		<test name='5'>
 			<description>Sharee sees new data</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$shareecalendar:/2.ics</ruri>
 				<verify>
@@ -412,7 +412,7 @@
 		</test>
 		<test name='6'>
 			<description>Write proxy can write existing data with per-user alarm</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>PUT</method>
 				<ruri>$shareecalendar:/1.ics</ruri>
 				<data>
@@ -426,7 +426,7 @@
 		</test>
 		<test name='7'>
 			<description>Sharer sees new data without alarm</description>
-			<request print-response='no'>
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<verify>
@@ -440,7 +440,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharee sees new data with alarm</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GET</method>
 				<ruri>$shareecalendar:/1.ics</ruri>
 				<verify>
@@ -457,7 +457,7 @@
 	<test-suite name='Proxy property changes'>
 		<test name='1'>
 			<description>Read proxy cannot write properties</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PROPPATCH</method>
 				<ruri>$shareecalendar:/</ruri>
 				<data>
@@ -475,7 +475,7 @@
 		</test>
 		<test name='2'>
 			<description>Write proxy can write properties</description>
-			<request host2="yes" user="$puserid4:" pswd="$ppswd4:" print-response='no'>
+			<request host2="yes" user="$puserid4:" pswd="$ppswd4:">
 				<method>PROPPATCH</method>
 				<ruri>$shareecalendar:/</ruri>
 				<data>
@@ -491,9 +491,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>Sharer sees original displayname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -513,9 +513,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Sharee sees new displayname</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -548,7 +548,7 @@
 			<ruri>$pnotificationpath3:/</ruri>
 			<ruri>$pnotificationpath4:/</ruri>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>PROPPATCH</method>
 			<ruri>$pprincipal2:calendar-proxy-read/</ruri>
 			<data>
@@ -556,7 +556,7 @@
 				<filepath>Resource/CalDAV-pod/sharing/proxies/setupproxies/3.xml</filepath>
 			</data>
 		</request>
-		<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response="no">
+		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>PROPPATCH</method>
 			<ruri>$pprincipal2:calendar-proxy-write/</ruri>
 			<data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-replies.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-replies.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-replies.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -45,9 +45,9 @@
 	</start>
 	
 	<test-suite name='Send first reply'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -61,11 +61,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -112,9 +112,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -144,7 +144,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -160,9 +160,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Check sharee calendar displyname/shared-url</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -183,9 +183,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Check sharer calendar displyname</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -210,10 +210,10 @@
 	<test-suite name='Update reply'>
 		<test name='1'>
 			<description>Sharee replies DECLINED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingdecline2-pod.xml</filepath>
 				</data>
@@ -222,9 +222,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Check declined status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -254,7 +254,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-multiget.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-multiget.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-multiget.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -272,7 +272,7 @@
 	</start>
 	
 	<test-suite name='Set up share'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
 			<request>
 				<method>POST</method>
@@ -309,7 +309,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -326,7 +326,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>POST invitation</description>
 			<request>
 				<method>POST</method>
@@ -363,7 +363,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -382,13 +382,13 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='multiget reports' ignore='no'>
-		<test name='1a' ignore='no'>
+	<test-suite name='multiget reports'>
+		<test name='1a'>
 			<description>basic multiget of 4 resources returning etag and entire ics data</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/1.xml</filepath>
 				</data>
@@ -427,7 +427,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='1b' ignore='no'>
+		<test name='1b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -435,7 +435,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareetaskspath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/1b.xml</filepath>
 				</data>
@@ -456,12 +456,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>basic multiget of 4 resources returning etag and only VCALENDAR property data (no embedded components)</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/2.xml</filepath>
 				</data>
@@ -477,12 +477,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>basic multiget of 4 resources returning etag and only VTIMEZONE components</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/3.xml</filepath>
 				</data>
@@ -498,12 +498,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4a' ignore='no'>
+		<test name='4a'>
 			<description>basic multiget of 4 resources returning etag and only SUMMARY/UID properties inside VEVENT components and VALARMs</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/4.xml</filepath>
 				</data>
@@ -542,7 +542,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4b' ignore='no'>
+		<test name='4b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -550,7 +550,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareetaskspath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/4b.xml</filepath>
 				</data>
@@ -571,12 +571,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5a' ignore='no'>
+		<test name='5a'>
 			<description>as 4.xml except that the SUMMARY property value is not returned</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/5.xml</filepath>
 				</data>
@@ -615,7 +615,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5b' ignore='no'>
+		<test name='5b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -623,7 +623,7 @@
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareetaskspath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/5b.xml</filepath>
 				</data>
@@ -644,12 +644,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Does allprop</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/6.xml</filepath>
 				</data>
@@ -665,12 +665,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Does propname</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/7.xml</filepath>
 				</data>
@@ -686,12 +686,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Single non-existent query</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/multiget/8.xml</filepath>
 				</data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -79,7 +79,7 @@
 		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>POST</method>
 			<ruri>$pcalendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 			</data>
@@ -124,7 +124,7 @@
 		<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 			<method>POST</method>
 			<ruri>$pcalendarhome2:/</ruri>
-			<data substitutions='yes'>
+			<data>
 				<content-type>application/xml; charset=utf-8</content-type>
 				<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 			</data>
@@ -361,8 +361,8 @@
 		</request>
 	</start>
 	
-	<test-suite name='basic query reports' ignore='no'>
-		<test name='1a' ignore='no'>
+	<test-suite name='basic query reports'>
+		<test name='1a'>
 			<description>query for resources with VCALENDAR &amp; VEVENT defined</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -399,7 +399,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='1b' ignore='no'>
+		<test name='1b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -419,7 +419,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2a' ignore='no'>
+		<test name='2a'>
 			<description>query for resources with VCALENDAR &amp; VEVENT not defined</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -455,7 +455,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2b' ignore='no'>
+		<test name='2b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -481,7 +481,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '1'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -507,7 +507,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for resources where the SUMMARY in a VEVENT does not contain the character '1'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -535,7 +535,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for resources where the DESCRIPTION property exists in a VEVENT</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -555,7 +555,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query for resources where the DESCRIPTION property does not exist in a VEVENT</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -591,7 +591,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -609,7 +609,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter not containing the text 'Paci'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -643,7 +643,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query for resources that have a DTSTART in a VEVENT that contains a TZID parameter containing the text 'Paci' and 'Moun'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -660,7 +660,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -682,7 +682,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>query for resources where the SUMMARY in a VEVENT contains the character '4' and has a DTSTART in a VEVENT that contains a TZID parameter containing the text 'East'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -701,7 +701,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -739,7 +739,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>query for resources where the RECURRENCE-ID in a VEVENT does not contain a RANGE parameter</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -758,7 +758,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14a' ignore='no'>
+		<test name='14a'>
 			<description>query for resources with VCALENDAR &amp; VTODO defined</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -793,7 +793,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14b' ignore='no'>
+		<test name='14b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -819,7 +819,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>query for resources where the SUMMARY in a VTODO contains the character '1'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -837,7 +837,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>query for resources that have a DUE in a VTODO that contains a TZID parameter containing the text 'East'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -857,7 +857,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17a' ignore='no'>
+		<test name='17a'>
 			<description>query for resources with VCALENDAR &amp; VEVENT and VTODO defined</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -874,7 +874,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='17b' ignore='no'>
+		<test name='17b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -894,7 +894,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18a' ignore='no'>
+		<test name='18a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -971,7 +971,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18b' ignore='no'>
+		<test name='18b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -998,7 +998,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19a' ignore='no'>
+		<test name='19a'>
 			<description>query for resources where the SUMMARY in a VEVENT and VTODO contains the character '1'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1015,7 +1015,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19b' ignore='no'>
+		<test name='19b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -1035,7 +1035,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20a' ignore='no'>
+		<test name='20a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1086,7 +1086,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20b' ignore='no'>
+		<test name='20b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -1108,7 +1108,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21' ignore='no'>
+		<test name='21'>
 			<description>query for resources that have a DTSTART in a VEVENT with TZID containg 'Paci' and a DUE in a VTODO with TZID containing 'East'</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1125,7 +1125,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22a' ignore='no'>
+		<test name='22a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1162,7 +1162,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22b' ignore='no'>
+		<test name='22b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -1186,7 +1186,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23' ignore='no'>
+		<test name='23'>
 			<description>query for VEVENTs that do not contain VALARMs</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1220,7 +1220,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24' ignore='no'>
+		<test name='24'>
 			<description>query for VEVENTs that contain a CATEGORY and filter by CATEGORY</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1242,7 +1242,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='25' ignore='no'>
+		<test name='25'>
 			<description>query for VEVENTs that contain a CATEGORY but test with uppercase string</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1264,7 +1264,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='26' ignore='no'>
+		<test name='26'>
 			<description>empty query</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1278,7 +1278,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='27' ignore='no'>
+		<test name='27'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1299,7 +1299,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='28' ignore='no'>
+		<test name='28'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1320,7 +1320,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='29' ignore='no'>
+		<test name='29'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1341,7 +1341,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='30' ignore='no'>
+		<test name='30'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1368,7 +1368,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='31' ignore='no'>
+		<test name='31'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1397,7 +1397,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='32' ignore='no'>
+		<test name='32'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1420,7 +1420,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='33' ignore='no'>
+		<test name='33'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1441,7 +1441,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='34' ignore='no'>
+		<test name='34'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1466,8 +1466,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='query reports with filtered data' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='query reports with filtered data'>
+		<test name='1'>
 			<description>query for resources with VCALENDAR &amp; VEVENT defined - return filtered data</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1492,7 +1492,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for resources with VCALENDAR &amp; VEVENT defined - return filtered data</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1519,8 +1519,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='time-range query reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='time-range query reports'>
+		<test name='1'>
 			<description>query for VEVENTs within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1541,7 +1541,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for VEVENT and VFREEBUSYs that have a CREATED/DTSTAMP within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1558,7 +1558,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1613,7 +1613,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for VEVENTs within time range with specific SUMMARY text</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1631,7 +1631,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for VEVENT recurrence instance within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1649,7 +1649,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query for overridden VEVENT instance within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1667,7 +1667,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query for overridden VEVENT not within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1681,7 +1681,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query for overridden this-and-future VEVENT within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1699,7 +1699,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query for VTODOs within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1719,7 +1719,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>query for VTODOs within time range with specific SUMMARY text</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1737,7 +1737,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>query for VTODO recurrence instance within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1757,7 +1757,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Invalid VTIMEZONE check</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1775,7 +1775,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>query for VEVENTs within time range in distant future</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1796,7 +1796,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>query for VEVENTs within time range - no end</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1829,7 +1829,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>query for VEVENTs within time range - no start</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1854,7 +1854,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='16' ignore='no'>
+		<test name='16'>
 			<description>query for VEVENTs within time range - no start and no end</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1890,7 +1890,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='18' ignore='no'>
+		<test name='18'>
 			<description>query for free busy with overlapping and consecutive events</description>
 			<request end-delete="yes">
 				<method>PUT</method>
@@ -1919,7 +1919,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19a' ignore='no'>
+		<test name='19a'>
 			<description>query for VEVENTS and VTODOs within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -1936,7 +1936,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='19b' ignore='no'>
+		<test name='19b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -1956,7 +1956,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20a' ignore='no'>
+		<test name='20a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -1999,7 +1999,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='20b' ignore='no'>
+		<test name='20b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -2023,7 +2023,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21a' ignore='no'>
+		<test name='21a'>
 			<description>query for VEVENTS and VTODOs with start only</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2040,7 +2040,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='21b' ignore='no'>
+		<test name='21b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -2060,7 +2060,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22a' ignore='no'>
+		<test name='22a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -2130,7 +2130,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='22b' ignore='no'>
+		<test name='22b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -2155,7 +2155,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23a' ignore='no'>
+		<test name='23a'>
 			<description>query for VEVENTS with start only and all VTODOs</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2172,7 +2172,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='23b' ignore='no'>
+		<test name='23b'>
 			<require-feature>
 				<feature>split-calendars</feature>
 			</require-feature>
@@ -2192,7 +2192,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24a' ignore='no'>
+		<test name='24a'>
 			<require-feature>
 				<feature>query-extended</feature>
 			</require-feature>
@@ -2264,7 +2264,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='24b' ignore='no'>
+		<test name='24b'>
 			<require-feature>
 				<feature>query-extended</feature>
 				<feature>split-calendars</feature>
@@ -2291,7 +2291,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='25' ignore='no'>
+		<test name='25'>
 			<require-feature>
 				<feature>timerange-low-limit</feature>
 			</require-feature>
@@ -2312,7 +2312,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='26' ignore='no'>
+		<test name='26'>
 			<require-feature>
 				<feature>timerange-low-limit</feature>
 			</require-feature>
@@ -2333,7 +2333,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='27' ignore='no'>
+		<test name='27'>
 			<require-feature>
 				<feature>timerange-low-limit</feature>
 			</require-feature>
@@ -2354,7 +2354,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='28' ignore='no'>
+		<test name='28'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2375,7 +2375,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='29' ignore='no'>
+		<test name='29'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2396,7 +2396,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='30' ignore='no'>
+		<test name='30'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2417,7 +2417,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='31' ignore='no'>
+		<test name='31'>
 			<require-feature>
 				<feature>timerange-high-limit</feature>
 			</require-feature>
@@ -2440,8 +2440,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='alarm time-range query reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='alarm time-range query reports'>
+		<test name='1'>
 			<description>query for VALARMS within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2459,7 +2459,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for repeating VALARMS within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2477,7 +2477,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>query for recurring VALARMS within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2496,7 +2496,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>query for recurring/overridden VALARMS within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2515,7 +2515,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query for VALARMS on VTODO within time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2535,8 +2535,8 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='free-busy reports' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='free-busy reports'>
+		<test name='1'>
 			<description>query for free busy with time range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2572,7 +2572,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>query for free busy with overlapping and consecutive events</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2623,10 +2623,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='limit/expand recurrence in reports' ignore='no'>
+	<test-suite name='limit/expand recurrence in reports'>
 		<test name='1' ignore='yes'>
 			<description>time-range query with limit over same range</description>
-			<request print-response='yes'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
 				<data>
@@ -2646,7 +2646,7 @@
 		</test>
 		<test name='2' ignore='yes'>
 			<description>time-range query with limit over different range</description>
-			<request print-response='yes'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$shareecalendarpath2:/</ruri>
 				<data>
@@ -2664,7 +2664,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>time-range query with expand over same range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2685,7 +2685,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>time-range query with expand over different range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2706,7 +2706,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>query with limit-freebusy-set</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2736,7 +2736,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>query with expand all-day - no timezone no match</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2750,7 +2750,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>query with expand all-day non-recurring - no timezone match</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2776,7 +2776,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>query with expand all-day recurring - no timezone match</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2802,7 +2802,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>query with expand all-day - timezone</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2828,7 +2828,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>query with expand all-day - recurrence</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2856,7 +2856,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>time-range query with expand for one event - DURATION test</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
@@ -2891,7 +2891,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>time-range query with expand for one recurring event skipping cancelled first instance</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" end-delete="yes">
 				<method>PUT</method>
@@ -2949,7 +2949,7 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>time-range query with expand for one recurring event shifted into time-range</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" end-delete="yes">
 				<method>PUT</method>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-sync.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-sync.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-sync.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -43,7 +43,7 @@
 				<callback>statusCode</callback>
 			</verify>
 		</request>
-		<request print-response='no'>
+		<request>
 			<method>PROPPATCH</method>
 			<ruri>$calendarhome1:/shared/</ruri>
 			<data>
@@ -54,9 +54,9 @@
 	</start>
 	
 	<test-suite name='Read-write calendar'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>Initial sync tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -71,7 +71,7 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<data>
@@ -86,7 +86,7 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -101,7 +101,7 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<data>
@@ -116,7 +116,7 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<data>
@@ -132,9 +132,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -148,11 +148,11 @@
 		</test>
 		<test name='3'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -179,10 +179,10 @@
 		</test>
 		<test name='4'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -203,12 +203,12 @@
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -225,10 +225,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -249,10 +249,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -267,10 +267,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -287,10 +287,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -314,10 +314,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-init-level-1.xml</filepath>
 				</data>
@@ -332,7 +332,7 @@
 		</test>
 		<test name='6'>
 			<description>Sharee creates event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PUT</method>
 				<ruri>$pcalendarhome2:/$sharedcalendar:/1.ics</ruri>
 				<data>
@@ -344,12 +344,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -365,10 +365,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -385,10 +385,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -404,10 +404,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -422,10 +422,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -441,10 +441,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -463,7 +463,7 @@
 		</test>
 		<test name='8'>
 			<description>Sharer changes event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -475,12 +475,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -496,10 +496,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -516,10 +516,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -535,10 +535,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -553,10 +553,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -572,10 +572,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -594,7 +594,7 @@
 		</test>
 		<test name='10'>
 			<description>Sharee deletes event</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETE</method>
 				<ruri>$pcalendarhome2:/$sharedcalendar:/1.ics</ruri>
 				<verify>
@@ -602,12 +602,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -623,10 +623,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -646,10 +646,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -665,10 +665,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -683,10 +683,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -702,10 +702,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -724,7 +724,7 @@
 		</test>
 		<test name='12'>
 			<description>Sharer unshares</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -736,12 +736,12 @@
 				</verify>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Updated tokens</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -757,10 +757,10 @@
 					<variable>$synctoken1:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -776,10 +776,10 @@
 					<variable>$synctoken2:</variable>
 				</grabelement>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/shared/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token3-level-1.xml</filepath>
 				</data>
@@ -791,10 +791,10 @@
 					<variable>$synctoken3:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token4-level-1.xml</filepath>
 				</data>
@@ -814,10 +814,10 @@
 					<variable>$synctoken4:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token5-level-infinite.xml</filepath>
 				</data>
@@ -837,10 +837,10 @@
 					<variable>$synctoken5:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/$sharedcalendar:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token6-level-1.xml</filepath>
 				</data>
@@ -856,11 +856,11 @@
 	</test-suite>
 	
 
-	<test-suite name='calendar webdav property change - home depth:infinity' ignore='no'>
+	<test-suite name='calendar webdav property change - home depth:infinity'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation and accept</description>
 			<request>
 				<method>DELETEALL</method>
@@ -870,7 +870,7 @@
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -881,11 +881,11 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -909,10 +909,10 @@
 					<variable>$hosturl2:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -933,9 +933,9 @@
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -963,9 +963,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>initial query - grab token for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -996,7 +996,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Change a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1010,16 +1010,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1043,16 +1043,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1076,7 +1076,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Remove a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1090,16 +1090,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1123,16 +1123,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1156,7 +1156,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Change a property by user 2</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
@@ -1170,16 +1170,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1202,16 +1202,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1235,7 +1235,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Remove a property by user 2</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
@@ -1249,16 +1249,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-infinite.xml</filepath>
 				</data>
@@ -1281,16 +1281,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-infinite.xml</filepath>
 				</data>
@@ -1316,7 +1316,7 @@
 		</test>
 		<test name='16'>
 			<description>Sharer unshares</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -1330,11 +1330,11 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='calendar webdav property change - home depth:1' ignore='no'>
+	<test-suite name='calendar webdav property change - home depth:1'>
 		<require-feature>
 			<feature>sync-report-home</feature>
 		</require-feature>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation and accept</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>DELETEALL</method>
@@ -1344,7 +1344,7 @@
 				<method>DELETEALL</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -1355,11 +1355,11 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -1383,10 +1383,10 @@
 					<variable>$hosturl2:</variable>
 				</grabelement>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -1404,9 +1404,9 @@
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>initial query - grab token</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
@@ -1434,9 +1434,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>initial query - grab token for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
@@ -1464,7 +1464,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Change a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1478,16 +1478,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1511,16 +1511,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='6' ignore='no'>
+		<test name='6'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1543,7 +1543,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='7' ignore='no'>
+		<test name='7'>
 			<description>Remove a property by user 1</description>
 			<request>
 				<method>PROPPATCH</method>
@@ -1557,16 +1557,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='8' ignore='no'>
+		<test name='8'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1590,16 +1590,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='9' ignore='no'>
+		<test name='9'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1622,7 +1622,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='10' ignore='no'>
+		<test name='10'>
 			<description>Change a property by user 2</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
@@ -1636,16 +1636,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='11' ignore='no'>
+		<test name='11'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1668,16 +1668,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='12' ignore='no'>
+		<test name='12'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1701,7 +1701,7 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='13' ignore='no'>
+		<test name='13'>
 			<description>Remove a property by user 2</description>
 			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPPATCH</method>
@@ -1715,16 +1715,16 @@
 				</verify>
 			</request>
 		</test>
-		<test name='14' ignore='no'>
+		<test name='14'>
 			<description>Sync for user 1</description>
-			<request print-response='no'>
+			<request>
 				<method>REPORT</method>
 				<ruri>$calendarhome1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token1-level-1.xml</filepath>
 				</data>
@@ -1747,16 +1747,16 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='15' ignore='no'>
+		<test name='15'>
 			<description>Sync for user 2</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>REPORT</method>
 				<ruri>$pcalendarhome2:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>0</value>
 				</header>
-				<data substitutions='yes'>
+				<data>
 					<content-type>text/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/REPORT/sync-token2-level-1.xml</filepath>
 				</data>
@@ -1782,7 +1782,7 @@
 		</test>
 		<test name='16'>
 			<description>Sharer unshares</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-unshare.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-unshare.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-unshare.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -44,10 +44,10 @@
 		</request>
 	</start>
 	
-	<test-suite name='Set up share' ignore="no">
-		<test name='1' ignore='no'>
+	<test-suite name='Set up share'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -61,11 +61,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -112,9 +112,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -144,7 +144,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -162,10 +162,10 @@
 		</test>
 	</test-suite>
 	
-	<test-suite name='Delete' ignore="no">
+	<test-suite name='Delete'>
 		<test name='1'>
 			<description>Sharer adds event</description>
-			<request print-response='no'>
+			<request>
 				<method>PUT</method>
 				<ruri>$calendarhome1:/shared/1.ics</ruri>
 				<data>
@@ -177,9 +177,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='2' ignore='no'>
+		<test name='2'>
 			<description>Sharee deletes shared calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>DELETE</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -191,9 +191,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='3' ignore='no'>
+		<test name='3'>
 			<description>No more shared calendar</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>PROPFIND</method>
 				<ruri>$shareecalendar:/</ruri>
 				<header>
@@ -213,9 +213,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Sharer still has calendar data</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -237,10 +237,10 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Reshare after sharee DELETE shared calendar' ignore='no'>
-		<test name='1' ignore='no'>
+	<test-suite name='Reshare after sharee DELETE shared calendar'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -254,11 +254,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -281,10 +281,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -305,9 +305,9 @@
 				</grabelement>
 			</request>
 		</test>
-		<test name='4' ignore='no'>
+		<test name='4'>
 			<description>Check accept status</description>
-			<request print-response='no'>
+			<request>
 				<method>PROPFIND</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<header>
@@ -337,7 +337,7 @@
 				<method>WAITCOUNT 1</method>
 				<ruri>$notificationpath1:/</ruri>
 			</request>
-			<request print-response='no'>
+			<request>
 				<method>GETNEW</method>
 				<ruri>$notificationpath1:/</ruri>
 				<verify>
@@ -356,10 +356,10 @@
 	</test-suite>
 
 
-	<test-suite name='Invite, display name change, uninvite' ignore="no">
-		<test name='1' ignore='no'>
+	<test-suite name='Invite, display name change, uninvite'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -373,11 +373,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath3:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath3:/</ruri>
 				<verify>
@@ -400,10 +400,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee replies ACCEPTED</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>POST</method>
 				<ruri>$pcalendarhome3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV-pod/sharing/unshare/shareruninvite/3.xml</filepath>
 				</data>
@@ -426,7 +426,7 @@
 		</test>
 		<test name='4'>
 			<description>Sharee changes name</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>PROPPATCH</method>
 				<ruri>$shareecalendar:/</ruri>
 				<data>
@@ -442,9 +442,9 @@
 				</verify>
 			</request>
 		</test>
-		<test name='5' ignore='no'>
+		<test name='5'>
 			<description>POST uninvitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -458,11 +458,11 @@
 		</test>
 		<test name='6'>
 			<description>Check Sharee notification collection</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath3:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath3:/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-webcal.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-webcal.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-webcal.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -50,9 +50,9 @@
 	</start>
 	
 	<test-suite name='Setup two sharees'>
-		<test name='1' ignore='no'>
+		<test name='1'>
 			<description>POST invitation</description>
-			<request print-response='no'>
+			<request>
 				<method>POST</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<data>
@@ -66,11 +66,11 @@
 		</test>
 		<test name='2'>
 			<description>Check Sharee 2 notification collection</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath2:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath2:/</ruri>
 				<verify>
@@ -88,10 +88,10 @@
 		</test>
 		<test name='3'>
 			<description>Sharee 2 replies ACCEPTED</description>
-			<request host2="yes" user="$puserid2:" pswd="$ppswd2:" print-response='no'>
+			<request host2="yes" user="$puserid2:" pswd="$ppswd2:">
 				<method>POST</method>
 				<ruri>$pcalendarhome2:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply2-pod.xml</filepath>
 				</data>
@@ -106,11 +106,11 @@
 		</test>
 		<test name='4'>
 			<description>Check Sharee 3 notification collection</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>WAITCOUNT 1</method>
 				<ruri>$pnotificationpath3:/</ruri>
 			</request>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>GETNEW</method>
 				<ruri>$pnotificationpath3:/</ruri>
 				<verify>
@@ -128,10 +128,10 @@
 		</test>
 		<test name='5'>
 			<description>Sharee 3 replies ACCEPTED</description>
-			<request host2="yes" user="$puserid3:" pswd="$ppswd3:" print-response='no'>
+			<request host2="yes" user="$puserid3:" pswd="$ppswd3:">
 				<method>POST</method>
 				<ruri>$pcalendarhome3:/</ruri>
-				<data substitutions='yes'>
+				<data>
 					<content-type>application/xml; charset=utf-8</content-type>
 					<filepath>Resource/Common/POST/sharingreply3-pod.xml</filepath>
 				</data>
@@ -381,7 +381,7 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>
@@ -398,7 +398,7 @@
 		</test>
 		<test name='2'>
 			<description>GET on calendar collection after sharee PUT - 2nd time from cache</description>
-			<request print-response="no">
+			<request>
 				<method>GET</method>
 				<ruri>$calendarhome1:/shared/</ruri>
 				<verify>

Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/simple.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/simple.xml	2014-06-27 19:24:29 UTC (rev 13698)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/simple.xml	2014-06-27 20:08:04 UTC (rev 13699)
@@ -261,7 +261,7 @@
 		</test>
 	</test-suite>
 
-	<test-suite name='Access calendar homes via podB' only='yes'>
+	<test-suite name='Access calendar homes via podB'>
 		<test name='1'>
 			<description>PROPFIND of user on podA as user on podA</description>
 			<request host2='yes'>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140627/c7478b74/attachment-0001.html>


More information about the calendarserver-changes mailing list