diff --git a/wst/trunk/tests/test_suite/files/array_sequence_collection.xsd b/wst/trunk/tests/test_suite/files/array_sequence_collection.xsd
new file mode 100644
index 000000000..313da0548
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/array_sequence_collection.xsd
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<schema 
+  xmlns:tns="urn:wst-test" 
+  xmlns:wst="urn:wst_base" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  targetNamespace="urn:wst-test">
+  
+  <xsd:complexType name="TComplexType"/>
+  <xsd:complexType name="TCollectionComplexType">
+    <xsd:sequence>
+      <xsd:element name="item" type="tns:TComplexType" maxOccurs="unbounded" minOccurs="0" wst:wst_collection="true"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  
+</schema>
diff --git a/wst/trunk/tests/test_suite/files/class_headerblock_derived.wsdl b/wst/trunk/tests/test_suite/files/class_headerblock_derived.wsdl
new file mode 100644
index 000000000..a3fd2f586
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/class_headerblock_derived.wsdl
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<definitions name="wst_test" 
+   xmlns="http://schemas.xmlsoap.org/wsdl/" 
+   xmlns:tns="library1" 
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+   xmlns:wst="urn:wst_base"
+   targetNamespace="urn:wst-test">
+
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:wst-test">
+    
+        <xsd:complexType name="TSampleHeader" wst:wst_headerBlock="true">
+          <xsd:sequence>
+            <xsd:element name="intField" type="xsd:int"/>
+            <xsd:element name="strField" type="xsd:string"/>
+            <xsd:element name="floatField" type="xsd:float"/>
+          </xsd:sequence>
+          <xsd:attribute use="required" name="strAtt" type="xsd:string"/>
+          <xsd:attribute use="required" name="intAtt" type="xsd:int"/>
+        </xsd:complexType>    
+    
+    </xsd:schema>
+  </types>
+  
+
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/class_headerblock_derived.xsd b/wst/trunk/tests/test_suite/files/class_headerblock_derived.xsd
new file mode 100644
index 000000000..b2b1b6867
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/class_headerblock_derived.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<schema xmlns:tns="class_headerblock_derived" xmlns:wst="urn:wst_base" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="class_headerblock_derived">
+  <xsd:complexType name="TSampleHeader" wst:wst_headerBlock="true">
+    <xsd:sequence>
+      <xsd:element name="intField" type="xsd:int"/>
+      <xsd:element name="strField" type="xsd:string"/>
+      <xsd:element name="floatField" type="xsd:float"/>
+    </xsd:sequence>
+    <xsd:attribute use="required" name="strAtt" type="xsd:string"/>
+    <xsd:attribute use="required" name="intAtt" type="xsd:int"/>
+  </xsd:complexType>
+</schema>
diff --git a/wst/trunk/tests/test_suite/files/class_headerblock_simplecontent_derived.wsdl b/wst/trunk/tests/test_suite/files/class_headerblock_simplecontent_derived.wsdl
new file mode 100644
index 000000000..591fd953a
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/class_headerblock_simplecontent_derived.wsdl
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<definitions name="wst_test" 
+   xmlns="http://schemas.xmlsoap.org/wsdl/" 
+   xmlns:tns="library1" 
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+   xmlns:wst="urn:wst_base"
+   targetNamespace="urn:wst-test">
+
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:wst-test">
+    
+        <xsd:complexType name="TSampleHeader" wst:wst_headerBlockSimpleContent="true">
+          <xsd:attribute use="required" name="strAtt" type="xsd:string"/>
+          <xsd:attribute use="required" name="intAtt" type="xsd:int"/>
+        </xsd:complexType>    
+    
+    </xsd:schema>
+  </types>
+  
+
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/class_headerblock_simplecontent_derived.xsd b/wst/trunk/tests/test_suite/files/class_headerblock_simplecontent_derived.xsd
new file mode 100644
index 000000000..cafb44b0a
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/class_headerblock_simplecontent_derived.xsd
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<schema 
+    xmlns:tns="class_headerblock_simplecontent_derived" 
+    xmlns:wst="urn:wst_base" 
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+    targetNamespace="class_headerblock_simplecontent_derived">
+  <xsd:complexType name="TSampleHeader" wst:wst_headerBlockSimpleContent="true">
+    <xsd:attribute use="required" name="strAtt" type="xsd:string"/>
+    <xsd:attribute use="required" name="intAtt" type="xsd:int"/>
+  </xsd:complexType>
+</schema>
diff --git a/wst/trunk/tests/test_suite/files/write_header_simple_content_1.xml b/wst/trunk/tests/test_suite/files/write_header_simple_content_1.xml
new file mode 100644
index 000000000..da8ce7746
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/write_header_simple_content_1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<SOAP-ENV:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+  <SOAP-ENV:Header xmlns:ns1="urn:simple-content-header.sample">
+    <ns1:TSampleSimpleContentHeaderBlock_A SOAP-ENV:mustUnderstand="0">sample header simple content value</ns1:TSampleSimpleContentHeaderBlock_A>
+  </SOAP-ENV:Header>
+  <SOAP-ENV:Body>
+    <ns2:test_proc xmlns:ns2="TestService"/>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
diff --git a/wst/trunk/tests/test_suite/files/write_header_simple_content_2.xml b/wst/trunk/tests/test_suite/files/write_header_simple_content_2.xml
new file mode 100644
index 000000000..70fb1e5c3
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/write_header_simple_content_2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<SOAP-ENV:Envelope 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance" 
+  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" 
+  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+  <SOAP-ENV:Header xmlns:ns1="urn:simple-content-header.sample">
+    <ns1:TSampleSimpleContentHeaderBlock_A SOAP-ENV:mustUnderstand="0">sample header simple content value</ns1:TSampleSimpleContentHeaderBlock_A>
+    <ns1:TSampleSimpleContentHeaderBlock_B ns1:intAtt="1210" SOAP-ENV:mustUnderstand="0">another content</ns1:TSampleSimpleContentHeaderBlock_B>
+  </SOAP-ENV:Header>
+  <SOAP-ENV:Body>
+    <ns2:test_proc xmlns:ns2="TestService"/>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>