diff --git a/test/FileRest-soapui-project.xml b/test/FileRest-soapui-project.xml
index 25648f2..8b59cd4 100644
--- a/test/FileRest-soapui-project.xml
+++ b/test/FileRest-soapui-project.xml
@@ -7,4 +7,4 @@
   <con:entry key="itemsPerPage" value="50"/>
   <con:entry key="depth" value="2"/>
   <con:entry key="includeDirectories" value="0"/>
-</con:parameters><con:parameterOrder><con:entry>directory</con:entry><con:entry>includeDirectories</con:entry><con:entry>depth</con:entry><con:entry>includeFiles</con:entry><con:entry>search</con:entry><con:entry>itemsPerPage</con:entry><con:entry>usecache</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="getFile" path="/FileService/getFile"><con:settings/><con:parameters><con:parameter><con:name>file</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080/XServices/fileinfo</con:endpoint><con:request/><con:originalUri>http://localhost/XServices/fileinfo/FileService/getFile</con:originalUri><con:credentials><con:username>admin</con:username><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="file" value="c:/temp/test.txt" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>file</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
+</con:parameters><con:parameterOrder><con:entry>directory</con:entry><con:entry>includeDirectories</con:entry><con:entry>depth</con:entry><con:entry>includeFiles</con:entry><con:entry>search</con:entry><con:entry>itemsPerPage</con:entry><con:entry>usecache</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="getFile" path="/FileService/getFile"><con:settings/><con:parameters><con:parameter><con:name>file</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>404</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>404</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>401</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>401</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>application/octet-stream</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://ec2-52-28-65-132.eu-central-1.compute.amazonaws.com:8080/XServices/fileinfo</con:endpoint><con:request/><con:originalUri>http://localhost/XServices/fileinfo/FileService/getFile</con:originalUri><con:credentials><con:username>admin</con:username><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="file" value="D:/Program Files/Serena/common/tomcat/7.0/logs/serenatomcat-stdout.2015-09-02.log" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>file</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
\ No newline at end of file
diff --git a/test/StringService-soapui-project.xml b/test/StringService-soapui-project.xml
index 765ec9a..7dd3af9 100644
--- a/test/StringService-soapui-project.xml
+++ b/test/StringService-soapui-project.xml
@@ -245,13 +245,19 @@
       <ws:replaceRegEx>
          </ws:replaceRegEx>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/replaceRegEx"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="matchRegEx" bindingOperationName="matchRegEx" type="Request-Response" outputName="matchRegExResponse" inputName="matchRegEx" 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/StringService</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:matchRegEx>
-         </ws:matchRegEx>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/matchRegEx"/></con:call></con:operation><con:operation isOneWay="false" action="" name="splitString" bindingOperationName="splitString" type="Request-Response" outputName="splitStringResponse" inputName="splitString" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</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:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/replaceRegEx"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="matchRegEx" bindingOperationName="matchRegEx" type="Request-Response" outputName="matchRegExResponse" inputName="matchRegEx" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</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:matchRegEx>
+         <!--Optional:-->
+         <string>?</string>
+         <!--Optional:-->
+         <search>?</search>
+         <!--Optional:-->
+         <regexflags>?</regexflags>
+      </ws:matchRegEx>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/matchRegEx"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="splitString" bindingOperationName="splitString" type="Request-Response" outputName="splitStringResponse" inputName="splitString" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</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:splitString>
@@ -269,7 +275,7 @@
          <string>?</string>
       </ws:encodeToXMLEntities>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/encodeToXMLEntities"/></con:call></con:operation><con:operation isOneWay="false" action="" name="removeCRLF" bindingOperationName="removeCRLF" type="Request-Response" outputName="removeCRLFResponse" inputName="removeCRLF" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</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:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/encodeToXMLEntities"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="removeCRLF" bindingOperationName="removeCRLF" type="Request-Response" outputName="removeCRLFResponse" inputName="removeCRLF" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</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:removeCRLF>