diff --git a/ivy.xml b/ivy.xml
index bfbb87f..98a1cdc 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -60,15 +60,12 @@
         <dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-databinding-aegis" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="2.7.0"/>
+        <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="2.7.0"/>
                  
    		<dependency org="rhino" name="js" rev="1.7R2"/>
             
 
         <!--
-        <dependency org="org.apache.cxf" name="cxf-bundle" rev="2.7.0"/>
-        <dependency org="org.apache.cxf" name="cxf-api" rev="2.7.0"/>
-        <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="2.7.0"/>
-        <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-bindings-soap" rev="2.7.0"/>
         <dependency org="org.apache.cxf" name="cxf-rt-databinding-jaxb" rev="2.7.0"/>
         -->
@@ -80,6 +77,9 @@
 		<dependency org="javax.sql" name="jdbc-stdext" rev="2.0" />		
 		-->
 
+		<!-- 
+			Locally managed libraries
+		-->
 		<dependency org="lib" name="java-unrar" rev="0.3" conf="*->*">
 			<artifact name="java-unrar" type="jar" />
 		</dependency>
diff --git a/ivysettings.xml b/ivysettings.xml
index 4e9f586..22fbb58 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -3,8 +3,6 @@
 	<settings defaultResolver="defaultchain" />
 	<resolvers>
 		<ibiblio name="apache-maven" m2compatible="true" usepoms="true"	root="http://repo.maven.apache.org/maven2/" />
-		<!-- <ibiblio name="java2" m2compatible="true" usepoms="true" root="https://maven.java.net/content/repositories/public/" /> -->
-
 		<ibiblio name="java" m2compatible="true" usepoms="true" root="http://download.java.net/maven/2/" />
 
 		<filesystem name="local-filesystem">
diff --git a/test/DateService-soapui-project.xml b/test/DateService-soapui-project.xml
index d680e6d..42e78f8 100644
--- a/test/DateService-soapui-project.xml
+++ b/test/DateService-soapui-project.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="DateService" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.actions.iface.tools.soapui.TestRunnerAction@values-local"><![CDATA[<xml-fragment xmlns:con="http://eviware.com/soapui/config">
+<con:soapui-project name="DateService" resourceRoot="" soapui-version="4.0.1.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.actions.iface.tools.soapui.TestRunnerAction@values-local"><![CDATA[<xml-fragment xmlns:con="http://eviware.com/soapui/config">
   <con:entry key="Global Properties" value=""/>
   <con:entry key="TestSuite" value="Basic Call Tests"/>
   <con:entry key="Report to Generate" value=""/>
@@ -663,7 +663,7 @@
    <soapenv:Header/>
    <soapenv:Body>
       <ws:dateAdd>
-         <datetime>2012-05-24T19:59:29.233+0200</datetime>
+         <datetime>2012-05-24T19:59:29.233+02:00</datetime>
          <value>365</value>
          <unit>hours</unit>
       </ws:dateAdd>
diff --git a/test/ExecuteService-soapui-project.xml b/test/ExecuteService-soapui-project.xml
index 9e50695..4cd40c1 100644
--- a/test/ExecuteService-soapui-project.xml
+++ b/test/ExecuteService-soapui-project.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="ExecuteService" soapui-version="3.6.1" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ExecuteServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}ExecuteServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/ExecuteService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/ExecuteService?wsdl"><con:part><con:url>http://localhost:8080/XServices/ExecuteService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="ExecuteService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<con:soapui-project name="ExecuteService" soapui-version="4.0.1.1" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ExecuteServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}ExecuteServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/ExecuteService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/ExecuteService?wsdl"><con:part><con:url>http://localhost:8080/XServices/ExecuteService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="ExecuteService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="antProperty" type="tns:antProperty"/>
@@ -387,7 +387,7 @@
          <argline>?</argline>
       </ws:runCommandAsync>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ExecuteService/runCommandAsync"/></con:call></con:operation><con:operation isOneWay="false" action="" name="runCommandAsyncWithArgs" bindingOperationName="runCommandAsyncWithArgs" type="Request-Response" outputName="runCommandAsyncWithArgsResponse" inputName="runCommandAsyncWithArgs" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/ExecuteService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ExecuteService/runCommandAsync"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="runCommandAsyncWithArgs" bindingOperationName="runCommandAsyncWithArgs" type="Request-Response" outputName="runCommandAsyncWithArgsResponse" inputName="runCommandAsyncWithArgs" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/ExecuteService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:runCommandAsyncWithArgs>