diff --git a/wst/trunk/tests/test_suite/files/class_properties_default.xsd b/wst/trunk/tests/test_suite/files/class_properties_default.xsd
new file mode 100644
index 000000000..903a3e6f1
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/class_properties_default.xsd
@@ -0,0 +1,11 @@
+<schema targetNamespace="class_properties_default" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="class_properties_default">
+	<xsd:complexType name="TClassSampleType">
+		<xsd:sequence>
+			<xsd:element name="intField" type="xsd:int" default="1210"/>
+			<xsd:element name="strField" type="xsd:string" default="azerty"/>
+			<xsd:element name="floatField" type="xsd:float" default="1234"/>
+		</xsd:sequence>
+		<xsd:attribute name="strAtt" type="xsd:string" default="attribute azerty" use="required"/>
+		<xsd:attribute name="intAtt" type="xsd:int" default="789" use="required"/>
+	</xsd:complexType>
+</schema>
diff --git a/wst/trunk/tests/test_suite/files/class_properties_extended_metadata.WSDL b/wst/trunk/tests/test_suite/files/class_properties_extended_metadata.WSDL
new file mode 100644
index 000000000..e66715852
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/class_properties_extended_metadata.WSDL
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<definitions name="wst_test" 
+   xmlns="http://schemas.xmlsoap.org/wsdl/" 
+   xmlns:tns="urn:wst-test" 
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+   targetNamespace="urn:wst-test">
+
+  <types>
+      <xsd:schema targetNamespace="urn:wst-test" 
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+        xmlns:ns3="uri-4"
+        xmlns:ns4="uri-5"
+        >
+        
+      	<xsd:complexType name="TClassSampleType">
+      		<xsd:sequence>
+      			<xsd:element name="intField" type="xsd:int" ns3:a="1210" ns3:b="ns4:xx"/>
+      			<xsd:element name="strField" type="xsd:string" default="azerty" ns3:a="xsd:int"/>
+      			<xsd:element name="floatField" type="xsd:float"/>
+      		</xsd:sequence>
+      		<xsd:attribute name="strAtt" type="xsd:string" default="attribute azerty" use="required" ns3:a="optional"/>
+      		<xsd:attribute name="intAtt" type="xsd:int" use="required"/>
+      	</xsd:complexType>
+        
+      </xsd:schema>
+  </types>
+  
+
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/class_properties_extended_metadata.xsd b/wst/trunk/tests/test_suite/files/class_properties_extended_metadata.xsd
new file mode 100644
index 000000000..d3e78dfe3
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/class_properties_extended_metadata.xsd
@@ -0,0 +1,18 @@
+<schema targetNamespace="urn:wst-test" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  xmlns:tns="urn:wst-test"
+  xmlns:ns3="uri-4"
+  xmlns:ns4="uri-5"
+  >
+  
+	<xsd:complexType name="TClassSampleType">
+		<xsd:sequence>
+			<xsd:element name="intField" type="xsd:int" ns3:a="1210" ns3:b="ns4:xx"/>
+			<xsd:element name="strField" type="xsd:string" default="azerty" ns3:a="xsd:int"/>
+			<xsd:element name="floatField" type="xsd:float"/>
+		</xsd:sequence>
+		<xsd:attribute name="strAtt" type="xsd:string" default="attribute azerty" use="required" ns3:a="optional"/>
+		<xsd:attribute name="intAtt" type="xsd:int" use="required"/>
+	</xsd:complexType>
+  
+</schema>
diff --git a/wst/trunk/tests/test_suite/files/complex_class_default.WSDL b/wst/trunk/tests/test_suite/files/complex_class_default.WSDL
new file mode 100644
index 000000000..c3f6511aa
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/complex_class_default.WSDL
@@ -0,0 +1,34 @@
+<?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/" 
+   targetNamespace="urn:wst-test">
+
+  <types>
+
+      <xsd:schema xmlns:n="urn:wst-test" 
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+        targetNamespace="urn:wst-test">
+        
+          <xsd:complexType name="TClassSampleType">
+      	    <xsd:sequence>
+      		    <xsd:element name="intField" type="xsd:int" default="1210"/>
+              <xsd:element name="strField" type="xsd:string" minOccurs="1" maxOccurs="1" default="azerty"/>
+              <xsd:element name="floatField" type="xsd:float" minOccurs="0" maxOccurs="1" default="1234"/>
+              <xsd:element name="byteField" type="xsd:byte" maxOccurs="1" default="23"/>
+              <xsd:element name="charField" type="xsd:char" minOccurs="1" default="i"/>
+              <xsd:element name="longField" type="xsd:long" minOccurs="0" default="567"/>
+      	    </xsd:sequence>
+      	    <xsd:attribute name="strAtt" type="xsd:string" default="attribute azerty"/>
+      	    <xsd:attribute name="intAtt" type="xsd:int" default="789"/>
+          </xsd:complexType>
+
+    
+      </xsd:schema>  
+  
+  </types>
+  
+
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/complex_class_default.xsd b/wst/trunk/tests/test_suite/files/complex_class_default.xsd
new file mode 100644
index 000000000..ae27e69fe
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/complex_class_default.xsd
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <xsd:schema xmlns:n="urn:wst-test" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  targetNamespace="urn:wst-test">
+  
+    <xsd:complexType name="TClassSampleType">
+	    <xsd:sequence>
+		    <xsd:element name="intField" type="xsd:int" default="1210"/>
+        <xsd:element name="strField" type="xsd:string" minOccurs="1" maxOccurs="1" default="azerty"/>
+        <xsd:element name="floatField" type="xsd:float" minOccurs="0" maxOccurs="1" default="1234"/>
+        <xsd:element name="byteField" type="xsd:byte" maxOccurs="1" default="23"/>
+        <xsd:element name="charField" type="xsd:char" minOccurs="1" default="i"/>
+        <xsd:element name="longField" type="xsd:long" minOccurs="0" default="567"/>
+	    </xsd:sequence>
+	    <xsd:attribute name="strAtt" type="xsd:string" default="attribute azerty"/>
+	    <xsd:attribute name="intAtt" type="xsd:int" default="789"/>
+    </xsd:complexType>
+       
+</xsd:schema>