diff --git a/test/scripts/tests/CalDAV/caldavIOP.xml b/test/scripts/tests/CalDAV/caldavIOP.xml
index 0665bda..74beb6d 100644
--- a/test/scripts/tests/CalDAV/caldavIOP.xml
+++ b/test/scripts/tests/CalDAV/caldavIOP.xml
@@ -1,360 +1,367 @@
 <?xml version="1.0" standalone="no"?>
 
 <!DOCTYPE caldavtest SYSTEM "caldavtest.dtd">
 
 <!--
  Copyright (c) 2006-2013 Apple Inc. All rights reserved.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
 
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
  -->
 
 <caldavtest>
 
 	<require-feature>
 		<feature>caldav</feature>
 	</require-feature>
 
 	<start/>
 	
 	<test-suite name='1. Event Creation'>
 		<test name='1.1'>
 			<description>Create new single-instance meeting titled "Meeting 1.1" with the location "Durham".</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/1/1_1.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='1.2'>
 			<description>Create new meeting titled "Meeting 1.2" recurring every Monday from 10:00 AM to 11:00 AM for 4 weeks.</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/1/1_2.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='1.3'>
 			<description>Create new single-instance meeting titled "Meeting 1.3" with 2 other attendees.</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/1/1_3.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='1.4'>
 			<description>Create new single-instance meeting titled "Meeting 1.4" with an alarm set to trigger 15 minutes prior to the schedule time of the meeting.</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
-				<ruri>$calendarpath1:/1-1_4.ics</ruri>
+				<ruri>$calendarpath1:/1-1_4-new.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/1/1_4.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
+				<verify>
+					<callback>header</callback>
+					<arg>
+						<name>Location</name>
+						<value>$calendarpath1:/1-1_4.ics</value>
+					</arg>
+				</verify>
 			</request>
 		</test>
 	</test-suite>
 	
 	<test-suite name='2. Event Modification'>
 		<test name='2.1'>
 			<description>Modify the title of meeting "Meeting 1.1" to "Meeting 1.1bis".</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_1.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.2'>
 			<description>Modify the location of the meeting "Meeting 1.1bis" to "Seattle bis".</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_2.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.3'>
 			<description>Reschedule meeting "Meeting 1.1bis" to the next day.</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_3.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.4'>
 			<description>Add an attendee to "Meeting 1.1bis".</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_4.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.5'>
 			<description>Add an alarm to "Meeting 1.1bis".</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_5.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.6'>
 			<description>Modify the title of the 1st instance of the recurring meeting created in 1.2.</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_6.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.7'>
 			<description>Modify the participation status of 1st instance to DECLINED.</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_7.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.8'>
 			<description>Cancel the 4th instance of the recurring meeting created in 1.2.</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_8.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='2.9'>
 			<description>One client changes "Meeting 1.1bis" to a different time, second client 'refreshes' its display to see the modification.</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/1-1_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/2/2_9.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 	</test-suite>
 
 	<test-suite name='4. Event Deletion'>
 		<test name='4.1'>
 			<description>Delete a single non-recurring meeting.</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4-4_1.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/4/4_1.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/4-4_1.ics</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='4.2'>
 			<description>Delete a single recurring meeting with no overridden instances.</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4-4_2.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/4/4_2.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/4-4_2.ics</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='4.3'>
 			<description>Delete a single recurring meeting with overridden instances.</description>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4-4_3.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/4/4_3.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request>
 				<method>DELETE</method>
 				<ruri>$calendarpath1:/4-4_3.ics</ruri>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='4.4'>
 			<description>Delete a non-overridden instance of a recurring meeting.</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4-4_4.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/4/4_4a.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4-4_4.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/4/4_4b.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 		<test name='4.5'>
 			<description>Delete an overridden instance of a recurring meeting.</description>
 			<request end-delete='yes'>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4-4_5.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/4/4_5a.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 			<request>
 				<method>PUT</method>
 				<ruri>$calendarpath1:/4-4_5.ics</ruri>
 				<data>
 					<content-type>text/calendar; charset=utf-8</content-type>
 					<filepath>Resource/CalDAV/caldaviop/4/4_5b.txt</filepath>
 				</data>
 				<verify>
 					<callback>statusCode</callback>
 				</verify>
 			</request>
 		</test>
 	</test-suite>
 	
 	<end>
 		<request user="$userid1:" pswd="$pswd1:">
 			<method>DELETEALL</method>
 			<ruri>$calendarpath1:/</ruri>
 		</request>
 		<request user="$userid1:" pswd="$pswd1:">
 			<method>DELETEALL</method>
 			<ruri>$inboxpath1:/</ruri>
 		</request>
 		<request user="$userid2:" pswd="$pswd2:">
 			<method>DELETEALL</method>
 			<ruri>$calendarpath2:/</ruri>
 		</request>
 		<request user="$userid2:" pswd="$pswd2:">
 			<method>DELETEALL</method>
 			<ruri>$inboxpath2:/</ruri>
 		</request>
 		<request user="$userid3:" pswd="$pswd3:">
 			<method>DELETEALL</method>
 			<ruri>$calendarpath3:/</ruri>
 		</request>
 		<request user="$userid3:" pswd="$pswd3:">
 			<method>DELETEALL</method>
 			<ruri>$inboxpath3:/</ruri>
 		</request>
 	</end>
 	
 </caldavtest>