diff --git a/tests/WebformulierenVerwerkerTestSuite.xml b/tests/WebformulierenVerwerkerTestSuite.xml
index be39cf4..7edd0c8 100644
--- a/tests/WebformulierenVerwerkerTestSuite.xml
+++ b/tests/WebformulierenVerwerkerTestSuite.xml
@@ -82,7 +82,7 @@
          <LastError/>
       </CreateMetaPersonResponse>
    </soap:Body>
-</soap:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://bct.nl/CORSA72WS4jSoap/CreateMetaPersonResponse"/></con:response><con:dispatchConfig/></con:mockOperation><con:mockOperation name="CreateMetaDocument" id="929dcd5f-f567-4be5-8442-8ef76702ee6a" interface="CORSA72WS4jSoap12" operation="CreateMetaDocument"><con:settings/><con:defaultResponse>Response 1</con:defaultResponse><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:response name="08 - CreateMetaDocument - voeg documentregistratie toe" id="d40b21b0-f875-4d27-a811-6046513ec186" httpResponseStatus="200" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+</soap:Envelope>]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://bct.nl/CORSA72WS4jSoap/CreateMetaPersonResponse"/></con:response><con:dispatchConfig/></con:mockOperation><con:mockOperation name="CreateMetaDocument" id="929dcd5f-f567-4be5-8442-8ef76702ee6a" interface="CORSA72WS4jSoap12" operation="CreateMetaDocument"><con:settings/><con:defaultResponse>Response 1</con:defaultResponse><con:dispatchStyle>QUERY_MATCH</con:dispatchStyle><con:response name="08 - CreateMetaDocument - voeg documentregistratie toe" id="d40b21b0-f875-4d27-a811-6046513ec186" httpResponseStatus="200" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
    <env:Header xmlns:env="http://www.w3.org/2003/05/soap-envelope">
       <wsa:Action>http://bct.nl/CreateMetaDocumentResponse</wsa:Action>
       <wsa:MessageID>urn:uuid:ad86d6e0-02a0-4971-a050-7a79756fc4de</wsa:MessageID>
@@ -124,7 +124,13 @@
       </CreateMetaDocumentResponse>
    </soap:Body>
 </soap:Envelope>
-]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://bct.nl/CORSA72WS4jSoap/CreateMetaDocumentResponse"/></con:response><con:dispatchConfig/></con:mockOperation><con:mockOperation name="CreateFileVersion" id="e61a10fc-c316-4053-a6d9-e21961da0afd" interface="CORSA72WS4jSoap12" operation="CreateFileVersion"><con:settings/><con:defaultResponse>Response 1</con:defaultResponse><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:response name="10 - CreateFileVersion - voeg documentbytes toe" id="9154208c-0331-4736-a5e3-01786115f97b" httpResponseStatus="200" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://bct.nl/CORSA72WS4jSoap/CreateMetaDocumentResponse"/></con:response><con:dispatchConfig xsi:type="con:MockOperationQueryMatchDispatch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:query><con:name>Bijlage</con:name><con:query>declare namespace bct='http://bct.nl';
+declare namespace soap='http://www.w3.org/2003/05/soap-envelope';
+declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
+//bct:ObjectKind</con:query><con:match>BIJL</con:match><con:response>11 - CreateMetaDocument - voeg bijlage toe</con:response></con:query><con:query><con:name>Persoon</con:name><con:query>declare namespace bct='http://bct.nl';
+declare namespace soap='http://www.w3.org/2003/05/soap-envelope';
+declare namespace soapenv='http://schemas.xmlsoap.org/soap/envelope/';
+//bct:ObjectKind</con:query><con:match>INK</con:match><con:response>08 - CreateMetaDocument - voeg documentregistratie toe</con:response></con:query></con:dispatchConfig></con:mockOperation><con:mockOperation name="CreateFileVersion" id="e61a10fc-c316-4053-a6d9-e21961da0afd" interface="CORSA72WS4jSoap12" operation="CreateFileVersion"><con:settings/><con:defaultResponse>Response 1</con:defaultResponse><con:dispatchStyle>QUERY_MATCH</con:dispatchStyle><con:response name="10 - CreateFileVersion - voeg documentbytes toe" id="9154208c-0331-4736-a5e3-01786115f97b" httpResponseStatus="200" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
    <env:Header xmlns:env="http://www.w3.org/2003/05/soap-envelope">
       <wsa:Action>http://bct.nl/CreateFileVersionResponse</wsa:Action>
       <wsa:MessageID>urn:uuid:65f91bcc-cd49-49ed-907a-69e3a8179ab0</wsa:MessageID>
@@ -198,7 +204,11 @@
       </CreateFileVersionResponse>
    </soap:Body>
 </soap:Envelope>
-]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://bct.nl/CORSA72WS4jSoap/CreateFileVersionResponse"/></con:response><con:dispatchConfig/></con:mockOperation><con:mockOperation name="ModObjectRelation" id="863fb31f-d058-44fd-a102-fb0419127cff" interface="CORSA72WS4jSoap12" operation="ModObjectRelation"><con:settings/><con:defaultResponse>Response 1</con:defaultResponse><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:response name="14 - ModObjectRelation - koppel de bijlage aan het document" id="2489a9ac-9a2c-4b11-b8fe-fdf3f11b3d74" httpResponseStatus="200" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+]]></con:responseContent><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://bct.nl/CORSA72WS4jSoap/CreateFileVersionResponse"/></con:response><con:dispatchConfig xsi:type="con:MockOperationQueryMatchDispatch" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:query><con:name>Bijlage</con:name><con:query>declare namespace bct='http://bct.nl';
+declare namespace soap='http://www.w3.org/2003/05/soap-envelope';
+//bct:ObjectID</con:query><con:match>BIJ.360830</con:match><con:response>13 - CreateFileVersion - voeg bijlagebytes toe</con:response></con:query><con:query><con:name>Persoon</con:name><con:query>declare namespace bct='http://bct.nl';
+declare namespace soap='http://www.w3.org/2003/05/soap-envelope';
+//bct:ObjectID</con:query><con:match>I23.080115</con:match><con:response>10 - CreateFileVersion - voeg documentbytes toe</con:response></con:query></con:dispatchConfig></con:mockOperation><con:mockOperation name="ModObjectRelation" id="863fb31f-d058-44fd-a102-fb0419127cff" interface="CORSA72WS4jSoap12" operation="ModObjectRelation"><con:settings/><con:defaultResponse>Response 1</con:defaultResponse><con:dispatchStyle>SEQUENCE</con:dispatchStyle><con:response name="14 - ModObjectRelation - koppel de bijlage aan het document" id="2489a9ac-9a2c-4b11-b8fe-fdf3f11b3d74" httpResponseStatus="200" encoding="UTF-8"><con:settings/><con:responseContent><![CDATA[<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
    <env:Header xmlns:env="http://www.w3.org/2003/05/soap-envelope">
       <wsa:Action>http://bct.nl/ModObjectRelationResponse</wsa:Action>
       <wsa:MessageID>urn:uuid:227f5331-a478-4ade-b5b3-c3eb0d1e1454</wsa:MessageID>
@@ -11841,8 +11851,7 @@
           <con:operation>opslaanInkNatuurlijkPersoon</con:operation>
           <con:request name="opslaanInkNatuurlijkPersoon" id="1a052a83-8083-4967-9e29-1d0f8807840c">
             <con:settings>
-              <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">
-                &lt;xml-fragment/></con:setting>
+              <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>${#Project#WebformulierenVerwerkerEndpoint}</con:endpoint>
@@ -11907,8 +11916,7 @@
           <con:operation>opslaanBijlage</con:operation>
           <con:request name="opslaanBijlage - Klein Document - Persoon" id="f3395460-7209-4be2-953b-834c9e10e544">
             <con:settings>
-              <con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">
-                &lt;xml-fragment/></con:setting>
+              <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>${#Project#WebformulierenVerwerkerEndpoint}</con:endpoint>