diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml
index 0b1b214d9935136096c58e097555a9f00c362c5a..27a54ae3dfb691f1da41319259d521eb40527223 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api-soapui-project.xml
@@ -3676,6 +3676,228 @@ assert actualHeader != null</scriptText>
</con:restRequest>
</con:config>
</con:testStep>
+ <con:testStep type="restrequest" name="POST BP 6.0 XX importPlanWithPngAndAux" id="69b2265a-a845-4ea6-bfcd-6bc6289e6826">
+ <con:settings/>
+ <con:config service="XPlanManagerAPI" resourcePath="/plan" methodName="import" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:restRequest name="POST BP 6.0 XX importPlanWithPngAndAux" id="bf7971d6-e318-4bdc-b279-2bb920237af7" mediaType="application/octet-stream" postQueryString="false">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><entry key="Accept" value="application/json" xmlns="http://eviware.com/soapui/config"/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
+ <con:request/>
+ <con:originalUri>http://localhost/xplan-manager-api/xmanager/api/v1/plan</con:originalUri>
+ <con:assertion type="Valid HTTP Status Codes" id="175f3cab-acc4-43f8-857f-68775292193b" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>201</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Existence Match" id="c208d8a8-95ee-415e-aac9-acb660fd11e2" name="id">
+ <con:configuration>
+ <path>$.id</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="727c0fd3-5cab-490a-a799-0465207ecae1" name="name">
+ <con:configuration>
+ <path>$.xplanModelData.name</path>
+ <content>BPlan003_6-0_SoapUI-XPlanManagerAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="GroovyScriptAssertion" id="c03a14b6-5334-45f9-b067-fb81a2782304" name="has Location Header">
+ <con:configuration>
+ <scriptText>def headers = messageExchange.response.responseHeaders
+def actualHeader = headers['Location']
+assert actualHeader != null</scriptText>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:domain xsi:nil="true"/>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:preemptive>true</con:preemptive>
+ <con:authType>Preemptive</con:authType>
+ </con:credentials>
+ <con:attachment>
+ <con:name>BPlan003_6-0.zip</con:name>
+ <con:contentType>application/octet-stream</con:contentType>
+ <con:contentId>BPlan003_6-0.zip</con:contentId>
+ <con:url>${projectDir}/xplan-manager-api/plans/BPlan003_6-0.zip</con:url>
+ <con:id>0c70fade-2e59-43eb-a59a-ee6dcbd05e46</con:id>
+ </con:attachment>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <entry key="skipLaufrichtung" value="" xmlns="http://eviware.com/soapui/config"/>
+ </con:parameters>
+ <con:parameterOrder>
+ <con:entry>X-Filename</con:entry>
+ <con:entry>skipSemantisch</con:entry>
+ <con:entry>skipFlaechenschluss</con:entry>
+ <con:entry>skipGeltungsbereich</con:entry>
+ <con:entry>internalId</con:entry>
+ <con:entry>planStatus</con:entry>
+ <con:entry>skipLaufrichtung</con:entry>
+ <con:entry>profiles</con:entry>
+ </con:parameterOrder>
+ </con:restRequest>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="restrequest" name="POST BP 6.0 XX importPlanWithGeoTiff" id="26db5d29-a1cc-447e-a2a0-7bf0f594bc4c">
+ <con:settings/>
+ <con:config service="XPlanManagerAPI" resourcePath="/plan" methodName="import" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:restRequest name="Copy of POST BP 6.0 XX importPlanWithGeoTiff" id="bf7971d6-e318-4bdc-b279-2bb920237af7" mediaType="application/octet-stream" postQueryString="false">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><entry key="Accept" value="application/json" xmlns="http://eviware.com/soapui/config"/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
+ <con:request/>
+ <con:originalUri>http://localhost/xplan-manager-api/xmanager/api/v1/plan</con:originalUri>
+ <con:assertion type="Valid HTTP Status Codes" id="175f3cab-acc4-43f8-857f-68775292193b" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>201</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Existence Match" id="c208d8a8-95ee-415e-aac9-acb660fd11e2" name="id">
+ <con:configuration>
+ <path>$.id</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="727c0fd3-5cab-490a-a799-0465207ecae1" name="name">
+ <con:configuration>
+ <path>$.xplanModelData.name</path>
+ <content>BPlan006_6-0_SoapUI-XPlanManagerAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="GroovyScriptAssertion" id="c03a14b6-5334-45f9-b067-fb81a2782304" name="has Location Header">
+ <con:configuration>
+ <scriptText>def headers = messageExchange.response.responseHeaders
+def actualHeader = headers['Location']
+assert actualHeader != null</scriptText>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:domain xsi:nil="true"/>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:preemptive>true</con:preemptive>
+ <con:authType>Preemptive</con:authType>
+ </con:credentials>
+ <con:attachment>
+ <con:name>BPlan006_6-0.zip</con:name>
+ <con:contentType>application/octet-stream</con:contentType>
+ <con:contentId>BPlan006_6-0.zip</con:contentId>
+ <con:url>${projectDir}/xplan-manager-api/plans/BPlan006_6-0.zip</con:url>
+ <con:id>0c70fade-2e59-43eb-a59a-ee6dcbd05e46</con:id>
+ </con:attachment>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <entry key="skipLaufrichtung" value="" xmlns="http://eviware.com/soapui/config"/>
+ </con:parameters>
+ <con:parameterOrder>
+ <con:entry>X-Filename</con:entry>
+ <con:entry>skipSemantisch</con:entry>
+ <con:entry>skipFlaechenschluss</con:entry>
+ <con:entry>skipGeltungsbereich</con:entry>
+ <con:entry>internalId</con:entry>
+ <con:entry>planStatus</con:entry>
+ <con:entry>skipLaufrichtung</con:entry>
+ <con:entry>profiles</con:entry>
+ </con:parameterOrder>
+ </con:restRequest>
+ </con:config>
+ </con:testStep>
+ <con:testStep type="restrequest" name="POST BP 6.0 XX importPlanWithGeoTiffAndAux" id="3dcf76ff-be42-4bc3-bcee-783de2b35060">
+ <con:settings/>
+ <con:config service="XPlanManagerAPI" resourcePath="/plan" methodName="import" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <con:restRequest name="POST BP 6.0 XX importPlanWithGeoTiffAndAux" id="bf7971d6-e318-4bdc-b279-2bb920237af7" mediaType="application/octet-stream" postQueryString="false">
+ <con:settings>
+ <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers"><entry key="Accept" value="application/json" xmlns="http://eviware.com/soapui/config"/></con:setting>
+ </con:settings>
+ <con:endpoint>${#Project#baseUrlManagerApi}/xmanager/api/v1</con:endpoint>
+ <con:request/>
+ <con:originalUri>http://localhost/xplan-manager-api/xmanager/api/v1/plan</con:originalUri>
+ <con:assertion type="Valid HTTP Status Codes" id="175f3cab-acc4-43f8-857f-68775292193b" name="Valid HTTP Status Codes">
+ <con:configuration>
+ <codes>201</codes>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Existence Match" id="c208d8a8-95ee-415e-aac9-acb660fd11e2" name="id">
+ <con:configuration>
+ <path>$.id</path>
+ <content>true</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="JsonPath Match" id="727c0fd3-5cab-490a-a799-0465207ecae1" name="name">
+ <con:configuration>
+ <path>$.xplanModelData.name</path>
+ <content>BPlan007_6-0_SoapUI-XPlanManagerAPI</content>
+ <allowWildcards>false</allowWildcards>
+ <ignoreNamspaceDifferences>false</ignoreNamspaceDifferences>
+ <ignoreComments>false</ignoreComments>
+ </con:configuration>
+ </con:assertion>
+ <con:assertion type="GroovyScriptAssertion" id="c03a14b6-5334-45f9-b067-fb81a2782304" name="has Location Header">
+ <con:configuration>
+ <scriptText>def headers = messageExchange.response.responseHeaders
+def actualHeader = headers['Location']
+assert actualHeader != null</scriptText>
+ </con:configuration>
+ </con:assertion>
+ <con:credentials>
+ <con:username>${#Project#username}</con:username>
+ <con:password>${#Project#password}</con:password>
+ <con:domain xsi:nil="true"/>
+ <con:selectedAuthProfile>Basic</con:selectedAuthProfile>
+ <con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes>
+ <con:preemptive>true</con:preemptive>
+ <con:authType>Preemptive</con:authType>
+ </con:credentials>
+ <con:attachment>
+ <con:name>BPlan007_6-0.zip</con:name>
+ <con:contentType>application/octet-stream</con:contentType>
+ <con:contentId>BPlan007_6-0.zip</con:contentId>
+ <con:url>${projectDir}/xplan-manager-api/plans/BPlan007_6-0.zip</con:url>
+ <con:id>0c70fade-2e59-43eb-a59a-ee6dcbd05e46</con:id>
+ </con:attachment>
+ <con:jmsConfig JMSDeliveryMode="PERSISTENT"/>
+ <con:jmsPropertyConfig/>
+ <con:parameters>
+ <entry key="skipLaufrichtung" value="" xmlns="http://eviware.com/soapui/config"/>
+ </con:parameters>
+ <con:parameterOrder>
+ <con:entry>X-Filename</con:entry>
+ <con:entry>skipSemantisch</con:entry>
+ <con:entry>skipFlaechenschluss</con:entry>
+ <con:entry>skipGeltungsbereich</con:entry>
+ <con:entry>internalId</con:entry>
+ <con:entry>planStatus</con:entry>
+ <con:entry>skipLaufrichtung</con:entry>
+ <con:entry>profiles</con:entry>
+ </con:parameterOrder>
+ </con:restRequest>
+ </con:config>
+ </con:testStep>
<con:testStep type="restrequest" name="POST BP 6.0.2 XX importPlan" id="6b342b52-2a9e-47ff-b998-5318c671552c">
<con:settings/>
<con:config service="XPlanManagerAPI" resourcePath="/plan" methodName="import" xsi:type="con:RestRequestStep" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan003_6-0.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan003_6-0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9d49e482c5f6c3b5ab17068825c28ec0c66fa3ac
Binary files /dev/null and b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan003_6-0.zip differ
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan006_6-0.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan006_6-0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9e35b964447c10c7b2474a5a6d4832ba999dfe4c
Binary files /dev/null and b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan006_6-0.zip differ
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan007_6-0.zip b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan007_6-0.zip
new file mode 100644
index 0000000000000000000000000000000000000000..9dac453c35553107ed2323f8bd1bc903aebebb40
Binary files /dev/null and b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-manager-api/plans/BPlan007_6-0.zip differ