Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.algemeen.VhintraShell.EntiteitGebruikService.txt
===================================================================
diff -u -r31091 -r32227
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.algemeen.VhintraShell.EntiteitGebruikService.txt	(.../WS.algemeen.VhintraShell.EntiteitGebruikService.txt)	(revision 31091)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.algemeen.VhintraShell.EntiteitGebruikService.txt	(.../WS.algemeen.VhintraShell.EntiteitGebruikService.txt)	(revision 32227)
@@ -41,26 +41,10 @@
                 </s:complexContent>
             </s:complexType>
             <s:complexType abstract="true" name="Data"/>
-            <s:complexType name="GebruikerData">
+            <s:complexType name="DaroKlantData">
                 <s:complexContent>
-                    <s:extension base="s0:Data">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="ID" type="s:string"/>
-                            <s:element minOccurs="0" name="Code" type="s:string"/>
-                            <s:element minOccurs="0" name="Naam" type="s:string"/>
-                            <s:element minOccurs="0" name="KlantData" type="s0:KlantData"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="HandelKlantData">
-                <s:complexContent>
                     <s:extension base="s0:KlantData">
                         <s:sequence>
-                            <s:element minOccurs="0" name="StraatEnNr" type="s:string"/>
-                            <s:element minOccurs="0" name="Postcode" type="s:string"/>
-                            <s:element minOccurs="0" name="TelefoonNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="FaxNummer" type="s:string"/>
                             <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
                         </s:sequence>
                     </s:extension>
@@ -92,54 +76,23 @@
                     <s:enumeration value="ES"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="KischKlantData">
+            <s:complexType name="GebruikerData">
                 <s:complexContent>
-                    <s:extension base="s0:KlantData">
+                    <s:extension base="s0:Data">
                         <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
+                            <s:element minOccurs="0" name="ID" type="s:string"/>
+                            <s:element minOccurs="0" name="Code" type="s:string"/>
+                            <s:element minOccurs="0" name="Naam" type="s:string"/>
+                            <s:element minOccurs="0" name="KlantData" type="s0:VanHoeckeKlantData"/>
                         </s:sequence>
                     </s:extension>
                 </s:complexContent>
             </s:complexType>
-            <s:complexType name="VanRaemdonckKlantData">
+            <s:complexType name="VanHoeckeKlantData">
                 <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="BaseHandel">
-                <s:complexContent>
-                    <s:extension base="s0:HandelKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Destil">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Dupont">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Kisch">
-                <s:complexContent>
-                    <s:extension base="s0:KischKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="SFS">
-                <s:complexContent>
                     <s:extension base="s0:KlantData"/>
                 </s:complexContent>
             </s:complexType>
-            <s:complexType name="VanRaemdonck">
-                <s:complexContent>
-                    <s:extension base="s0:VanRaemdonckKlantData"/>
-                </s:complexContent>
-            </s:complexType>
             <s:complexType name="GelinkteToeleveringData">
                 <s:complexContent>
                     <s:extension base="s0:ToeleveringData">
@@ -166,11 +119,33 @@
                         <s:sequence>
                             <s:element minOccurs="0" name="ID" type="s:string"/>
                             <s:element minOccurs="0" name="Code" type="s:string"/>
-                            <s:element minOccurs="0" name="KlantData" type="s0:KlantData"/>
+                            <s:element minOccurs="0" name="KlantData" type="s0:VanHoeckeKlantData"/>
                         </s:sequence>
                     </s:extension>
                 </s:complexContent>
             </s:complexType>
+            <s:complexType name="HandelKlantData">
+                <s:complexContent>
+                    <s:extension base="s0:KlantData">
+                        <s:sequence>
+                            <s:element minOccurs="0" name="StraatEnNr" type="s:string"/>
+                            <s:element minOccurs="0" name="Postcode" type="s:string"/>
+                            <s:element minOccurs="0" name="TelefoonNummer" type="s:string"/>
+                            <s:element minOccurs="0" name="FaxNummer" type="s:string"/>
+                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
+                        </s:sequence>
+                    </s:extension>
+                </s:complexContent>
+            </s:complexType>
+            <s:complexType name="KischKlantData">
+                <s:complexContent>
+                    <s:extension base="s0:KlantData">
+                        <s:sequence>
+                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
+                        </s:sequence>
+                    </s:extension>
+                </s:complexContent>
+            </s:complexType>
             <s:complexType name="PersonalityData">
                 <s:complexContent>
                     <s:extension base="s0:Data">
@@ -203,6 +178,15 @@
                     <s:element minOccurs="0" name="Thumbnail" type="s:string"/>
                 </s:sequence>
             </s:complexType>
+            <s:complexType name="VanRaemdonckKlantData">
+                <s:complexContent>
+                    <s:extension base="s0:KlantData">
+                        <s:sequence>
+                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
+                        </s:sequence>
+                    </s:extension>
+                </s:complexContent>
+            </s:complexType>
             <s:complexType name="VerzendWijzeData">
                 <s:complexContent>
                     <s:extension base="s0:Data">
@@ -214,6 +198,41 @@
                     </s:extension>
                 </s:complexContent>
             </s:complexType>
+            <s:complexType name="BaseHandel">
+                <s:complexContent>
+                    <s:extension base="s0:HandelKlantData"/>
+                </s:complexContent>
+            </s:complexType>
+            <s:complexType name="Daro">
+                <s:complexContent>
+                    <s:extension base="s0:DaroKlantData"/>
+                </s:complexContent>
+            </s:complexType>
+            <s:complexType name="Destil">
+                <s:complexContent>
+                    <s:extension base="s0:BaseHandel"/>
+                </s:complexContent>
+            </s:complexType>
+            <s:complexType name="Dupont">
+                <s:complexContent>
+                    <s:extension base="s0:BaseHandel"/>
+                </s:complexContent>
+            </s:complexType>
+            <s:complexType name="Kisch">
+                <s:complexContent>
+                    <s:extension base="s0:KischKlantData"/>
+                </s:complexContent>
+            </s:complexType>
+            <s:complexType name="SFS">
+                <s:complexContent>
+                    <s:extension base="s0:KlantData"/>
+                </s:complexContent>
+            </s:complexType>
+            <s:complexType name="VanRaemdonck">
+                <s:complexContent>
+                    <s:extension base="s0:VanRaemdonckKlantData"/>
+                </s:complexContent>
+            </s:complexType>
             <s:element name="RegistreerGebruikteEntiteit">
                 <s:complexType>
                     <s:sequence>