diff --git a/wst/trunk/tests/test_suite/files/wsdl_gen_complex_type_derivation.wsdl b/wst/trunk/tests/test_suite/files/wsdl_gen_complex_type_derivation.wsdl
new file mode 100644
index 000000000..bbba6ebcd
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/wsdl_gen_complex_type_derivation.wsdl
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<definitions name="runtime_generator" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="urn:sample-namespace" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="urn:sample-namespace">
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:sample-namespace">
+      <xsd:simpleType name="TTestEnum">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="teA"/>
+          <xsd:enumeration value="teB"/>
+          <xsd:enumeration value="teC"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+      <xsd:complexType name="TClass_A">
+        <xsd:sequence>
+          <xsd:element name="A_StringProp" type="xsd:string" maxOccurs="1" minOccurs="1"/>
+        </xsd:sequence>
+      </xsd:complexType>
+      <xsd:complexType name="TClass_AB">
+        <xsd:complexContent>
+          <xsd:extension base="tns:TClass_A">
+            <xsd:sequence>
+              <xsd:element name="AB_IntProp" type="xsd:int" maxOccurs="1" minOccurs="1"/>
+            </xsd:sequence>
+          </xsd:extension>
+        </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="Class_ABC">
+        <xsd:complexContent>
+          <xsd:extension base="tns:TClass_AB">
+            <xsd:sequence>
+              <xsd:element name="ABC_BoolProp" type="xsd:boolean" maxOccurs="1" minOccurs="1"/>
+            </xsd:sequence>
+            <xsd:attribute use="required" name="ABC_EnumAttProp" type="tns:TTestEnum"/>
+          </xsd:extension>
+        </xsd:complexContent>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/wsdl_gen_generate_array.wsdl b/wst/trunk/tests/test_suite/files/wsdl_gen_generate_array.wsdl
new file mode 100644
index 000000000..081532d36
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/wsdl_gen_generate_array.wsdl
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<definitions name="runtime_generator" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="urn:sample-namespace" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="urn:sample-namespace">
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:sample-namespace">
+      <xsd:complexType name="TArrayOfStringRemotableSample">
+        <xsd:sequence>
+          <xsd:element name="item" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:complexType>
+      <xsd:complexType name="TArrayOfIntRemotableSample">
+        <xsd:sequence>
+          <xsd:element name="int_value" type="xsd:int" maxOccurs="unbounded" minOccurs="0"/>
+        </xsd:sequence>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/wsdl_gen_generate_enum.wsdl b/wst/trunk/tests/test_suite/files/wsdl_gen_generate_enum.wsdl
new file mode 100644
index 000000000..b8e676254
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/wsdl_gen_generate_enum.wsdl
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<definitions name="runtime_generator" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="urn:sample-namespace" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="urn:sample-namespace">
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:sample-namespace">
+      <xsd:simpleType name="TestEnum_Type">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="A"/>
+          <xsd:enumeration value="teB"/>
+          <xsd:enumeration value="The C Item"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:schema>
+  </types>
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/wsdl_gen_generate_record.wsdl b/wst/trunk/tests/test_suite/files/wsdl_gen_generate_record.wsdl
new file mode 100644
index 000000000..45cea0061
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/wsdl_gen_generate_record.wsdl
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<definitions name="runtime_generator" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="urn:sample-namespace" xmlns:wst="urn:wst_base" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="urn:sample-namespace">
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:sample-namespace">
+      <xsd:complexType name="TTestSmallRecord" wst:wst_record="true">
+        <xsd:sequence>
+          <xsd:element name="fieldSmallint" type="xsd:short" maxOccurs="1" minOccurs="0"/>
+          <xsd:element name="fieldString" type="xsd:string" maxOccurs="1" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute use="optional" name="fieldWord" type="xsd:unsignedShort"/>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+</definitions>