diff --git a/smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml b/smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml
index 1b6bd4426f7bd1df10549f9db83927bd8d794c9f..4c08707c93ee4dace16957d045b6a063d7be7fd6 100644
--- a/smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml
+++ b/smp-soapui-tests/soapui/SMP4.0-Generic-soapui-project.xml
@@ -4297,7 +4297,7 @@ To be updated or dropted expected result is an error. </con:description><con:set
 </con:parameters></con:restRequest></con:config></con:testStep><con:tearDownScript>// Run clean test steps.
 testRunner.testCase.testSteps['Delete ServiceMetadata'].run(testRunner, context);
 testRunner.testCase.testSteps['Delete ServiceGroup'].run(testRunner, context);
-//ExcelReporting.reportTestCase(testRunner, log)</con:tearDownScript><con:properties/><con:reportParameters/><con:breakPoints><con:testStepId>cda74952-fe52-42df-8643-8a59932a76f9</con:testStepId><con:status>NONE</con:status><con:properties/></con:breakPoints><con:breakPoints><con:testStepId>e84b7e54-b24e-491a-95b2-a12ff29eb5cc</con:testStepId><con:status>NONE</con:status><con:properties/></con:breakPoints><con:breakPoints><con:testStepId>46350f0e-d28d-4ed8-9a45-06d697f21192</con:testStepId><con:status>NONE</con:status><con:properties/></con:breakPoints></con:testCase><con:testCase id="f71d5a72-4115-4e0f-8d9c-61eff8d1bd23" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="SMP063-EDELIVERY-364 slash encoding" searchProperties="true"><con:description>EDELIVERY-364.
+//ExcelReporting.reportTestCase(testRunner, log)</con:tearDownScript><con:properties/><con:reportParameters/><con:breakPoints><con:testStepId>cda74952-fe52-42df-8643-8a59932a76f9</con:testStepId><con:status>NONE</con:status><con:properties/></con:breakPoints><con:breakPoints><con:testStepId>e84b7e54-b24e-491a-95b2-a12ff29eb5cc</con:testStepId><con:status>NONE</con:status><con:properties/></con:breakPoints><con:breakPoints><con:testStepId>46350f0e-d28d-4ed8-9a45-06d697f21192</con:testStepId><con:status>NONE</con:status><con:properties/></con:breakPoints></con:testCase><con:testCase id="f71d5a72-4115-4e0f-8d9c-61eff8d1bd23" failOnError="true" failTestCaseOnErrors="true" keepSession="false" maxResults="0" name="SMP063-EDELIVERY-364 slash encoding-Tomcat" searchProperties="true"><con:description>EDELIVERY-364.
 
 TODO 
 precondition: 
@@ -4313,13 +4313,13 @@ maybe clear some cache
 -> HTTP Response code 201 is returned.
 - Send GetServiceMetadata for the initial participant quadruplet.
 ->  HTTP Response code 200 is returned. 
-->The same previously pushed service Metadata is returned.</con:description><con:settings/><con:testStep type="restrequest" name="Put ServiceGroup" id="4de5c781-2e49-40ce-80a7-ec458bc5e846"><con:settings/><con:config service="SMP" resourcePath="/ehealth-actorid-qns::0088:777eHealth10100777" methodName="YYYZZZ-43-Put" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Put ServiceGroup" mediaType="text/xml" postQueryString="false" id="e50d78e0-763f-4bfd-aa1c-f4dcc7595a2a"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>${#Project#url}</con:endpoint><con:request><![CDATA[<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
+->The same previously pushed service Metadata is returned.</con:description><con:settings/><con:testStep type="restrequest" name="Put ServiceGroup" id="4de5c781-2e49-40ce-80a7-ec458bc5e846"><con:settings/><con:config service="SMP" resourcePath="/ehealth-actorid-qns::0088:777eHealth10100777" methodName="YYYZZZ-43-Put" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Put ServiceGroup" mediaType="text/xml" postQueryString="false" id="e50d78e0-763f-4bfd-aa1c-f4dcc7595a2a"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;entry key="domain" value="${#Project#defaultDomainName}" xmlns="http://eviware.com/soapui/config"/></con:setting></con:settings><con:endpoint>${#Project#url}</con:endpoint><con:request><![CDATA[<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
    <ParticipantIdentifier scheme="ehealth-actorid-qns">0088:777eHealth10100777</ParticipantIdentifier>
    <ServiceMetadataReferenceCollection/>
    <Extension>
       <ex:Test xmlns:ex="http://test.eu">Test</ex:Test>
    </Extension>
-</ServiceGroup>]]></con:request><con:originalUri>http://wltdgt02.cc.cec.eu.int/cipa-smp-full-webapp/ehealth-actorid-qns::0088:777eHealth10100777</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="1d09aed4-98eb-4750-b7d0-c7a7fccc8632" name="Valid HTTP Status Codes"><con:configuration><codes>201</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#adminSmp1Test}</con:username><con:password>${#Project#adminSmp1TestPassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:preemptive>true</con:preemptive><con:authType>Preemptive</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Get ServiceGroup" id="6505e870-be77-47eb-bfc3-16ba604c8417"><con:settings/><con:config service="SMP" resourcePath="/ehealth-actorid-qns::0088:777eHealth10100777" methodName="YYYZZZ-42-Get" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get ServiceGroup" mediaType="application/xml" id="a9f15369-89e3-4e53-a448-a9881605a8b0"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>${#Project#url}</con:endpoint><con:request/><con:originalUri>http://130.206.118.4/cipa-smp-full-webapp/iso6523-actorid-upis::0088:5798000000003</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="6aabeec4-5b90-47e4-801e-5efa631f5e1e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:preemptive>true</con:preemptive><con:authType>Preemptive</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Put ServiceMetadata" id="0d31de99-7c18-440c-b26f-3d2d6b5b163d"><con:settings/><con:config service="SMP" resourcePath="/ehealth-actorid-qns%3A%3A0088%3A777eHealth10100777/services/busdox-docid-qns%3A%3Ahttp%3A%2F%2Fwww.xvergabe.org%2Fxsd%2Fclient-interface%2Fmessages%2F2.2.e%3A%3Amessages.SubscriptionRequest%23%23urn%3Awww.cenbii.eu%3Atransaction%3Abiitrdm081%3Aver1.0%3A%3A2.2.e.1" methodName="YYYZZZ-46-Put" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Put ServiceMetadata" mediaType="text/xml" postQueryString="false" id="74cb305c-6d80-4836-a6eb-4c6cc61f0dab"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>${#Project#url}</con:endpoint><con:request><![CDATA[<ServiceMetadata xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
+</ServiceGroup>]]></con:request><con:originalUri>http://wltdgt02.cc.cec.eu.int/cipa-smp-full-webapp/ehealth-actorid-qns::0088:777eHealth10100777</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="1d09aed4-98eb-4750-b7d0-c7a7fccc8632" name="Valid HTTP Status Codes"><con:configuration><codes>201</codes></con:configuration></con:assertion><con:credentials><con:username>${#Project#adminSmp1Test}</con:username><con:password>${#Project#adminSmp1TestPassword}</con:password><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:preemptive>true</con:preemptive><con:authType>Preemptive</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Get ServiceGroup" id="6505e870-be77-47eb-bfc3-16ba604c8417"><con:settings/><con:config service="SMP" resourcePath="/ehealth-actorid-qns::0088:777eHealth10100777" methodName="YYYZZZ-42-Get" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Get ServiceGroup" mediaType="application/xml" id="a9f15369-89e3-4e53-a448-a9881605a8b0"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>${#Project#url}</con:endpoint><con:request/><con:originalUri>http://130.206.118.4/cipa-smp-full-webapp/iso6523-actorid-upis::0088:5798000000003</con:originalUri><con:assertion type="Valid HTTP Status Codes" id="6aabeec4-5b90-47e4-801e-5efa631f5e1e" name="Valid HTTP Status Codes"><con:configuration><codes>200</codes></con:configuration></con:assertion><con:credentials><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:preemptive>true</con:preemptive><con:authType>Preemptive</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters/></con:restRequest></con:config></con:testStep><con:testStep type="restrequest" name="Put ServiceMetadata" id="0d31de99-7c18-440c-b26f-3d2d6b5b163d"><con:settings/><con:config service="SMP" resourcePath="/ehealth-actorid-qns%3A%3A0088%3A777eHealth10100777/services/busdox-docid-qns%3A%3Ahttp%3A%2F%2Fwww.xvergabe.org%2Fxsd%2Fclient-interface%2Fmessages%2F2.2.e%3A%3Amessages.SubscriptionRequest%23%23urn%3Awww.cenbii.eu%3Atransaction%3Abiitrdm081%3Aver1.0%3A%3A2.2.e.1" methodName="YYYZZZ-46-Put" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:restRequest name="Put ServiceMetadata" mediaType="text/xml" postQueryString="false" id="74cb305c-6d80-4836-a6eb-4c6cc61f0dab"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;entry key="domain" value="" xmlns="http://eviware.com/soapui/config"/></con:setting></con:settings><con:endpoint>${#Project#url}</con:endpoint><con:request><![CDATA[<ServiceMetadata xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
    <ServiceInformation>
       <ParticipantIdentifier scheme="ehealth-actorid-qns">0088:777eHealth10100777</ParticipantIdentifier>
       <DocumentIdentifier scheme="busdox-docid-qns">http://www.xvergabe.org/xsd/client-interface/messages/2.2.e::messages.SubscriptionRequest##urn:www.cenbii.eu:transaction:biitrdm081:ver1.0::2.2.e.1</DocumentIdentifier>