Test cases updates
diff --git a/tests/auto_build/testcases/output/ComplexTypeChoiceArrayChild.request b/tests/auto_build/testcases/output/ComplexTypeChoiceArrayChild.request
index c2d1a7d..9ffc15f 100644
--- a/tests/auto_build/testcases/output/ComplexTypeChoiceArrayChild.request
+++ b/tests/auto_build/testcases/output/ComplexTypeChoiceArrayChild.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "XSD_byte#asComplexType"

-Content-Length: 498

+Content-Length: 497

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org">

-<SimpleComplexType1><arrayElement><intArray>5</intArray>

+<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org"><SimpleComplexType1><arrayElement><intArray>5</intArray>

 <intArray>6</intArray>

 <intArray>7</intArray>

 </arrayElement></SimpleComplexType1>

diff --git a/tests/auto_build/testcases/output/ComplexTypeChoiceComplexChild.request b/tests/auto_build/testcases/output/ComplexTypeChoiceComplexChild.request
index 39eac60..c0572e8 100644
--- a/tests/auto_build/testcases/output/ComplexTypeChoiceComplexChild.request
+++ b/tests/auto_build/testcases/output/ComplexTypeChoiceComplexChild.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "XSD_byte#asComplexType"

-Content-Length: 489

+Content-Length: 488

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org">

-<SimpleComplexType><complexTypeElement><onecomplexTypeElement>65</onecomplexTypeElement>

+<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org"><SimpleComplexType><complexTypeElement><onecomplexTypeElement>65</onecomplexTypeElement>

 </complexTypeElement></SimpleComplexType>

 </ns1:asComplexType>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/ComplexTypeChoiceNestedChoice.request b/tests/auto_build/testcases/output/ComplexTypeChoiceNestedChoice.request
index 867bc6b..ef2706f 100644
--- a/tests/auto_build/testcases/output/ComplexTypeChoiceNestedChoice.request
+++ b/tests/auto_build/testcases/output/ComplexTypeChoiceNestedChoice.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "XSD_byte#asComplexType"

-Content-Length: 423

+Content-Length: 422

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org">

-<SimpleComplexType1><field1>hello</field1>

+<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org"><SimpleComplexType1><field1>hello</field1>

 </SimpleComplexType1>

 </ns1:asComplexType>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request b/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request
index 5c8d6bf..ef22732 100644
--- a/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request
+++ b/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "http://complextype.test.apache.org"

-Content-Length: 448

+Content-Length: 447

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:asComplexTypeRequest xmlns:ns1="http://xsd_byte.test.apache.org">

-<SimpleComplexType1><field3>I am still here!</field3>

+<ns1:asComplexTypeRequest xmlns:ns1="http://xsd_byte.test.apache.org"><SimpleComplexType1><field3>I am still here!</field3>

 </SimpleComplexType1>

 </ns1:asComplexTypeRequest>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/ComplexTypeChoiceSimple.request b/tests/auto_build/testcases/output/ComplexTypeChoiceSimple.request
index ebde330..c0ba2ec 100644
--- a/tests/auto_build/testcases/output/ComplexTypeChoiceSimple.request
+++ b/tests/auto_build/testcases/output/ComplexTypeChoiceSimple.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "XSD_byte#asComplexType"

-Content-Length: 423

+Content-Length: 422

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org">

-<SimpleComplexType1><field1>12345</field1>

+<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org"><SimpleComplexType1><field1>12345</field1>

 </SimpleComplexType1>

 </ns1:asComplexType>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/ComplexTypeOptionalAll.request b/tests/auto_build/testcases/output/ComplexTypeOptionalAll.request
index 33e58a8..adb2089 100644
--- a/tests/auto_build/testcases/output/ComplexTypeOptionalAll.request
+++ b/tests/auto_build/testcases/output/ComplexTypeOptionalAll.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "http://complextype.test.apache.org"

-Content-Length: 500

+Content-Length: 499

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:myOperation xmlns:ns1="http://complextype.test.apache.org">

-<ns1:aType><ns1:field1>Hello World!</ns1:field1>

+<ns1:myOperation xmlns:ns1="http://complextype.test.apache.org"><ns1:aType><ns1:field1>Hello World!</ns1:field1>

 <ns1:field2>I&apos;m still here!</ns1:field2>

 <ns1:field3>Now I go!</ns1:field3>

 </ns1:aType>

diff --git a/tests/auto_build/testcases/output/ComplexTypeOptionalChoice.request b/tests/auto_build/testcases/output/ComplexTypeOptionalChoice.request
index fb5d408..875ed5b 100644
--- a/tests/auto_build/testcases/output/ComplexTypeOptionalChoice.request
+++ b/tests/auto_build/testcases/output/ComplexTypeOptionalChoice.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "XSD_byte#asComplexType"

-Content-Length: 430

+Content-Length: 429

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org">

-<SimpleComplexType1><field1>Hello World!</field1>

+<ns1:asComplexType xmlns:ns1="http://xsd_byte.test.apache.org"><SimpleComplexType1><field1>Hello World!</field1>

 </SimpleComplexType1>

 </ns1:asComplexType>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/ComplexTypeWithNillableSimpleElement_Request.expected b/tests/auto_build/testcases/output/ComplexTypeWithNillableSimpleElement_Request.expected
index 92cc0b2..b87982a 100644
--- a/tests/auto_build/testcases/output/ComplexTypeWithNillableSimpleElement_Request.expected
+++ b/tests/auto_build/testcases/output/ComplexTypeWithNillableSimpleElement_Request.expected
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "ComplexTypeWithNillableSimpleElement#echo"

-Content-Length: 443

+Content-Length: 442

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echo xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:simpleComplexType><ns1:complexTypeElement>1738</ns1:complexTypeElement>

+<ns1:echo xmlns:ns1="http://localhost/axis/Calculator"><ns1:simpleComplexType><ns1:complexTypeElement>1738</ns1:complexTypeElement>

 </ns1:simpleComplexType>

 </ns1:echo>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/Cookies.cpp.out b/tests/auto_build/testcases/output/Cookies.cpp.out
index 4563d23..b001897 100644
--- a/tests/auto_build/testcases/output/Cookies.cpp.out
+++ b/tests/auto_build/testcases/output/Cookies.cpp.out
@@ -2,7 +2,7 @@
 ----------------------------------------------------------

 Properties that were sent out

 SOAPAction="CalculatorDoc#add"

-Content-Length=397

+Content-Length=396

 ----------------------------------------------------------

 Properties that were received

 Server=WebSphere Application Server/5.1

@@ -18,7 +18,7 @@
 ----------------------------------------------------------

 Properties that were sent out

 SOAPAction="CalculatorDoc#add"

-Content-Length=397

+Content-Length=396

 Cookie=LtpaToken2=1234567890abcdefghijklmnopqrstuvwxyz;LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 ----------------------------------------------------------

 Properties that were received

@@ -31,7 +31,7 @@
 ----------------------------------------------------------

 Properties that were sent out

 SOAPAction="CalculatorDoc#add"

-Content-Length=397

+Content-Length=396

 ----------------------------------------------------------

 Properties that were received

 Server=WebSphere Application Server/5.1

@@ -45,7 +45,7 @@
 ----------------------------------------------------------

 Properties that were sent out

 SOAPAction="CalculatorDoc#add"

-Content-Length=397

+Content-Length=396

 Cookie=LtpaToken2=1234567890abcdefghijklmnopqrstuvwxyz;LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 ----------------------------------------------------------

 Properties that were received

@@ -57,7 +57,7 @@
 ----------------------------------------------------------

 Properties that were sent out

 SOAPAction="CalculatorDoc#add"

-Content-Length=397

+Content-Length=396

 Cookie=LtpaToken2=1234567890abcdefghijklmnopqrstuvwxyz;LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 ----------------------------------------------------------

 Properties that were received

@@ -71,7 +71,7 @@
 ----------------------------------------------------------

 Properties that were sent out

 SOAPAction="CalculatorDoc#add"

-Content-Length=397

+Content-Length=396

 Cookie=LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 ----------------------------------------------------------

 Properties that were received

@@ -85,7 +85,7 @@
 ----------------------------------------------------------

 Properties that were sent out

 SOAPAction="CalculatorDoc#add"

-Content-Length=397

+Content-Length=396

 ----------------------------------------------------------

 Properties that were received

 Server=WebSphere Application Server/5.1

diff --git a/tests/auto_build/testcases/output/Cookies.request b/tests/auto_build/testcases/output/Cookies.request
index f10709c..7d74c9d 100644
--- a/tests/auto_build/testcases/output/Cookies.request
+++ b/tests/auto_build/testcases/output/Cookies.request
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "CalculatorDoc#add"

-Content-Length: 397

+Content-Length: 396

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:arg_0_0>2</ns1:arg_0_0>

+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>

 <ns1:arg_1_0>3</ns1:arg_1_0>

 </ns1:add>

 </SOAP-ENV:Body>

@@ -18,14 +17,13 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "CalculatorDoc#add"

-Content-Length: 397

+Content-Length: 396

 Cookie: LtpaToken2=1234567890abcdefghijklmnopqrstuvwxyz;LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:arg_0_0>2</ns1:arg_0_0>

+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>

 <ns1:arg_1_0>3</ns1:arg_1_0>

 </ns1:add>

 </SOAP-ENV:Body>

@@ -35,13 +33,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "CalculatorDoc#add"

-Content-Length: 397

+Content-Length: 396

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:arg_0_0>2</ns1:arg_0_0>

+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>

 <ns1:arg_1_0>3</ns1:arg_1_0>

 </ns1:add>

 </SOAP-ENV:Body>

@@ -51,14 +48,13 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "CalculatorDoc#add"

-Content-Length: 397

+Content-Length: 396

 Cookie: LtpaToken2=1234567890abcdefghijklmnopqrstuvwxyz;LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:arg_0_0>2</ns1:arg_0_0>

+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>

 <ns1:arg_1_0>3</ns1:arg_1_0>

 </ns1:add>

 </SOAP-ENV:Body>

@@ -68,14 +64,13 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "CalculatorDoc#add"

-Content-Length: 397

+Content-Length: 396

 Cookie: LtpaToken2=1234567890abcdefghijklmnopqrstuvwxyz;LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:arg_0_0>2</ns1:arg_0_0>

+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>

 <ns1:arg_1_0>3</ns1:arg_1_0>

 </ns1:add>

 </SOAP-ENV:Body>

@@ -85,14 +80,13 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "CalculatorDoc#add"

-Content-Length: 397

+Content-Length: 396

 Cookie: LtpaToken==+yOkBBuvLtTaiuBDkfgy3W6mZraGn7V5Dzp;JSESSIONID=0000EyvJyGOS-2e9nlRijFiwKSR:-1

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:arg_0_0>2</ns1:arg_0_0>

+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>

 <ns1:arg_1_0>3</ns1:arg_1_0>

 </ns1:add>

 </SOAP-ENV:Body>

@@ -102,13 +96,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "CalculatorDoc#add"

-Content-Length: 397

+Content-Length: 396

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:arg_0_0>2</ns1:arg_0_0>

+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>

 <ns1:arg_1_0>3</ns1:arg_1_0>

 </ns1:add>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/DocLitNonwrapperTests_ClientRequest.expected b/tests/auto_build/testcases/output/DocLitNonwrapperTests_ClientRequest.expected
index 800cd10..eff309e 100644
--- a/tests/auto_build/testcases/output/DocLitNonwrapperTests_ClientRequest.expected
+++ b/tests/auto_build/testcases/output/DocLitNonwrapperTests_ClientRequest.expected
@@ -18,9 +18,9 @@
 Content-Length: 376

 

 <?xml version='1.0' encoding='utf-8' ?>

-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://dom.w3c.org">

 <SOAP-ENV:Body>

-<ns1:Operation2Request xmlns:ns1="http://dom.w3c.org"><number1>2000</number1>

+<ns1:Operation2Request><number1>2000</number1>

 </ns1:Operation2Request>

 </SOAP-ENV:Body>

 </SOAP-ENV:Envelope>

@@ -29,10 +29,10 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 329

+Content-Length: 360

 

 <?xml version='1.0' encoding='utf-8' ?>

-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://dom.w3c.org">

 <SOAP-ENV:Body>

 <ns1:Operation3Request xmlns:ns1="http://dom.w3c.org" /></SOAP-ENV:Body>

 </SOAP-ENV:Envelope>

@@ -44,9 +44,9 @@
 Content-Length: 459

 

 <?xml version='1.0' encoding='utf-8' ?>

-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://dom.w3c.org">

 <SOAP-ENV:Body>

-<ns1:Operation4Request xmlns:ns1="http://dom.w3c.org"><record><field1>field4444401</field1>

+<ns1:Operation4Request><record><field1>field4444401</field1>

 <field2>field4444402</field2>

 <field3>field4444403</field3>

 </record></ns1:Operation4Request>

@@ -60,9 +60,9 @@
 Content-Length: 459

 

 <?xml version='1.0' encoding='utf-8' ?>

-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://dom.w3c.org">

 <SOAP-ENV:Body>

-<ns1:Operation5Request xmlns:ns1="http://dom.w3c.org"><record><field1>field5555501</field1>

+<ns1:Operation5Request><record><field1>field5555501</field1>

 <field2>field5555502</field2>

 <field3>field5555503</field3>

 </record></ns1:Operation5Request>

diff --git a/tests/auto_build/testcases/output/DynamicAttachmentRequest.out b/tests/auto_build/testcases/output/DynamicAttachmentRequest.out
index fb55320..628b1df 100644
--- a/tests/auto_build/testcases/output/DynamicAttachmentRequest.out
+++ b/tests/auto_build/testcases/output/DynamicAttachmentRequest.out
@@ -2,7 +2,7 @@
 Host: localhost:13260
 SOAPAction: "Trash"
 Content-Type: multipart/related; type="text/xml"; boundary="------=MIME_BOUNDARY"; start="<5>"
-Content-Length: 1443
+Content-Length: 1442
 
 
 --------=MIME_BOUNDARY
@@ -13,8 +13,7 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:put xmlns:ns1="http://localhost/axis/DynamicAttachment">
-<arg_attachment_1 href="cid:1"/>
+<ns1:put xmlns:ns1="http://localhost/axis/DynamicAttachment"><arg_attachment_1 href="cid:1"/>
 <arg_attachment_2 href="cid:12"/>
 <arg_attachment_3 href="cid:3"
    mypfx1:myname1="http://dynamicattachment/test.axis.apache.org"
diff --git a/tests/auto_build/testcases/output/ElementFormDefaultTestRequest.out b/tests/auto_build/testcases/output/ElementFormDefaultTestRequest.out
index 1bae003..9fe1a0c 100644
--- a/tests/auto_build/testcases/output/ElementFormDefaultTestRequest.out
+++ b/tests/auto_build/testcases/output/ElementFormDefaultTestRequest.out
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 873

+Content-Length: 872

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:elementFormDefaultIsUnqualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/">

-<aStringType>Hello!</aStringType>

+<ns1:elementFormDefaultIsUnqualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/"><aStringType>Hello!</aStringType>

 <anIntegerType>123</anIntegerType>

 <anIntegerArray>0</anIntegerArray>

 <anIntegerArray>1</anIntegerArray>

@@ -26,13 +25,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 965

+Content-Length: 964

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:elementFormDefaultIsQualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/">

-<ns1:aStringType>Hello!</ns1:aStringType>

+<ns1:elementFormDefaultIsQualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/"><ns1:aStringType>Hello!</ns1:aStringType>

 <ns1:anIntegerType>123</ns1:anIntegerType>

 <ns1:anIntegerArray>0</ns1:anIntegerArray>

 <ns1:anIntegerArray>1</ns1:anIntegerArray>

@@ -50,13 +48,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 952

+Content-Length: 951

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:nestedElementFormDefaultIsUnqualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/">

-<ElementFormDefaultIsUnqualified><aStringType>Hello!</aStringType>

+<ns1:nestedElementFormDefaultIsUnqualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/"><ElementFormDefaultIsUnqualified><aStringType>Hello!</aStringType>

 <anIntegerType>123</anIntegerType>

 <anIntegerArray>0</anIntegerArray>

 <anIntegerArray>1</anIntegerArray>

@@ -74,13 +71,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 1048

+Content-Length: 1047

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:nestedElementFormDefaultIsQualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/">

-<ns1:ElementFormDefaultIsQualified><ns1:aStringType>Hello!</ns1:aStringType>

+<ns1:nestedElementFormDefaultIsQualified xmlns:ns1="http://tempuri.org/ElementFormDefaultTest/"><ns1:ElementFormDefaultIsQualified><ns1:aStringType>Hello!</ns1:aStringType>

 <ns1:anIntegerType>123</ns1:anIntegerType>

 <ns1:anIntegerArray>0</ns1:anIntegerArray>

 <ns1:anIntegerArray>1</ns1:anIntegerArray>

diff --git a/tests/auto_build/testcases/output/MinOccursIsZeroRequest.out b/tests/auto_build/testcases/output/MinOccursIsZeroRequest.out
index 6b1ab76..09e2186 100644
--- a/tests/auto_build/testcases/output/MinOccursIsZeroRequest.out
+++ b/tests/auto_build/testcases/output/MinOccursIsZeroRequest.out
@@ -2,13 +2,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "http://tempuri.org/MinOccursIsZero/NewOperation"

-Content-Length: 652

+Content-Length: 651

 

 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:optionalElements xmlns:ns1="http://tempuri.org/MinOccursIsZero/">

-<stringElement>Hello!</stringElement>

+<ns1:optionalElements xmlns:ns1="http://tempuri.org/MinOccursIsZero/"><stringElement>Hello!</stringElement>

 <integerElement>123</integerElement>

 <complexType><stringElement>Goodbye!</stringElement>

 <integerElement>234</integerElement>

@@ -23,13 +22,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "http://tempuri.org/MinOccursIsZero/NewOperation"

-Content-Length: 471

+Content-Length: 470

 

 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:optionalElements xmlns:ns1="http://tempuri.org/MinOccursIsZero/">

-<stringElement>Hello!</stringElement>

+<ns1:optionalElements xmlns:ns1="http://tempuri.org/MinOccursIsZero/"><stringElement>Hello!</stringElement>

 <integerElement>123</integerElement>

 <complexType></complexType>

 </ns1:optionalElements>

@@ -40,13 +38,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "http://tempuri.org/MinOccursIsZero/NewOperation"

-Content-Length: 368

+Content-Length: 367

 

 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:optionalElements xmlns:ns1="http://tempuri.org/MinOccursIsZero/">

-</ns1:optionalElements>

+<ns1:optionalElements xmlns:ns1="http://tempuri.org/MinOccursIsZero/"></ns1:optionalElements>

 </SOAP-ENV:Body>

 </SOAP-ENV:Envelope>
 
diff --git a/tests/auto_build/testcases/output/NamespaceTest1Request.expected b/tests/auto_build/testcases/output/NamespaceTest1Request.expected
index 14684e8..d6d05f0 100644
--- a/tests/auto_build/testcases/output/NamespaceTest1Request.expected
+++ b/tests/auto_build/testcases/output/NamespaceTest1Request.expected
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 686

+Content-Length: 685

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:aBeanPortType xmlns:ns1="SimpleNonBaseType">

-<Element xmlns:ns2="SimpleType"><ns2:Time xsi:nil="true"></ns2:Time><ns2:Boolean>false</ns2:Boolean>

+<ns1:aBeanPortType xmlns:ns1="SimpleNonBaseType"><Element xmlns:ns2="SimpleType"><ns2:Time xsi:nil="true"></ns2:Time><ns2:Boolean>false</ns2:Boolean>

 <ns2:Byte>0</ns2:Byte>

 <ns2:Calendar xsi:nil="true"></ns2:Calendar>

 <ns2:Double>0</ns2:Double>

diff --git a/tests/auto_build/testcases/output/NilValuesTest.request b/tests/auto_build/testcases/output/NilValuesTest.request
index f3b23cc..ffb4795 100644
--- a/tests/auto_build/testcases/output/NilValuesTest.request
+++ b/tests/auto_build/testcases/output/NilValuesTest.request
@@ -2,13 +2,12 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: "http://complextype.test.apache.org"
-Content-Length: 504
+Content-Length: 503
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:myOperation xmlns:ns1="http://complextype.test.apache.org">
-<ns1:aType><ns1:field1 xsi:nil="true"></ns1:field1>
+<ns1:myOperation xmlns:ns1="http://complextype.test.apache.org"><ns1:aType><ns1:field1 xsi:nil="true"></ns1:field1>
 <ns1:field2 xsi:nil="true"></ns1:field2>
 <ns1:field3 xsi:nil="true"></ns1:field3>
 </ns1:aType>
diff --git a/tests/auto_build/testcases/output/NillableArraysRequest.out b/tests/auto_build/testcases/output/NillableArraysRequest.out
index e5d7316..1efa4df 100644
--- a/tests/auto_build/testcases/output/NillableArraysRequest.out
+++ b/tests/auto_build/testcases/output/NillableArraysRequest.out
@@ -2,13 +2,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 470

+Content-Length: 469

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echoBooleanArray xmlns:ns1="http://arrays.test.apache.org">

-<ns1:arg_0_0>false</ns1:arg_0_0>

+<ns1:echoBooleanArray xmlns:ns1="http://arrays.test.apache.org"><ns1:arg_0_0>false</ns1:arg_0_0>

 <ns1:arg_0_0 xsi:nil="true"></ns1:arg_0_0>

 <ns1:arg_0_0>true</ns1:arg_0_0>

 </ns1:echoBooleanArray>

@@ -19,13 +18,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 463

+Content-Length: 462

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echoShortArray xmlns:ns1="http://arrays.test.apache.org">

-<ns1:arg_0_2>252</ns1:arg_0_2>

+<ns1:echoShortArray xmlns:ns1="http://arrays.test.apache.org"><ns1:arg_0_2>252</ns1:arg_0_2>

 <ns1:arg_0_2 xsi:nil="true"></ns1:arg_0_2>

 <ns1:arg_0_2>254</ns1:arg_0_2>

 </ns1:echoShortArray>

@@ -36,13 +34,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 467

+Content-Length: 466

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echoIntArray xmlns:ns1="http://arrays.test.apache.org">

-<ns1:arg_0_3>1000000</ns1:arg_0_3>

+<ns1:echoIntArray xmlns:ns1="http://arrays.test.apache.org"><ns1:arg_0_3>1000000</ns1:arg_0_3>

 <ns1:arg_0_3 xsi:nil="true"></ns1:arg_0_3>

 <ns1:arg_0_3>1000002</ns1:arg_0_3>

 </ns1:echoIntArray>

@@ -53,13 +50,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 467

+Content-Length: 466

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echoLongArray xmlns:ns1="http://arrays.test.apache.org">

-<ns1:arg_0_4>200001</ns1:arg_0_4>

+<ns1:echoLongArray xmlns:ns1="http://arrays.test.apache.org"><ns1:arg_0_4>200001</ns1:arg_0_4>

 <ns1:arg_0_4 xsi:nil="true"></ns1:arg_0_4>

 <ns1:arg_0_4>200003</ns1:arg_0_4>

 </ns1:echoLongArray>

@@ -70,13 +66,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 469

+Content-Length: 468

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echoFloatArray xmlns:ns1="http://arrays.test.apache.org">

-<ns1:arg_0_5>11.111</ns1:arg_0_5>

+<ns1:echoFloatArray xmlns:ns1="http://arrays.test.apache.org"><ns1:arg_0_5>11.111</ns1:arg_0_5>

 <ns1:arg_0_5 xsi:nil="true"></ns1:arg_0_5>

 <ns1:arg_0_5>33.111</ns1:arg_0_5>

 </ns1:echoFloatArray>

@@ -87,13 +82,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 473

+Content-Length: 472

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echoDoubleArray xmlns:ns1="http://arrays.test.apache.org">

-<ns1:arg_0_6>71.1565</ns1:arg_0_6>

+<ns1:echoDoubleArray xmlns:ns1="http://arrays.test.apache.org"><ns1:arg_0_6>71.1565</ns1:arg_0_6>

 <ns1:arg_0_6 xsi:nil="true"></ns1:arg_0_6>

 <ns1:arg_0_6>73.1565</ns1:arg_0_6>

 </ns1:echoDoubleArray>

@@ -104,13 +98,12 @@
 Host: localhost:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 473

+Content-Length: 472

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:echoStringArray xmlns:ns1="http://arrays.test.apache.org">

-<ns1:arg_0_7>Apache</ns1:arg_0_7>

+<ns1:echoStringArray xmlns:ns1="http://arrays.test.apache.org"><ns1:arg_0_7>Apache</ns1:arg_0_7>

 <ns1:arg_0_7 xsi:nil="true"></ns1:arg_0_7>

 <ns1:arg_0_7>Axis C++</ns1:arg_0_7>

 </ns1:echoStringArray>

diff --git a/tests/auto_build/testcases/output/ReplicaRequest.expected b/tests/auto_build/testcases/output/ReplicaRequest.expected
index 15aca23..705d17b 100644
--- a/tests/auto_build/testcases/output/ReplicaRequest.expected
+++ b/tests/auto_build/testcases/output/ReplicaRequest.expected
@@ -2,13 +2,12 @@
 Host: 9.20.98.177:9090

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 484

+Content-Length: 483

 

 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:miReplica xmlns:ns1="IAllTypesTestService">
-<iReplica xmlns:ns2="IAllTypesTestServiceReplica"><MyClass id="1612"><Name>Tester</Name>
+<ns1:miReplica xmlns:ns1="IAllTypesTestService"><iReplica xmlns:ns2="IAllTypesTestServiceReplica"><MyClass id="1612"><Name>Tester</Name>
 <Values>AAoUHigyPEZQWg==</Values>
 </MyClass></iReplica>
 </ns1:miReplica>
diff --git a/tests/auto_build/testcases/output/SameComplexTypeAndElementName_Request.expected b/tests/auto_build/testcases/output/SameComplexTypeAndElementName_Request.expected
index 79cd899..8448049 100644
--- a/tests/auto_build/testcases/output/SameComplexTypeAndElementName_Request.expected
+++ b/tests/auto_build/testcases/output/SameComplexTypeAndElementName_Request.expected
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 474

+Content-Length: 473

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:aBeanPortTypeBase xmlns:ns1="SameComplexTypeAndElementName">

-<Element xmlns:ns2="SameComplexTypeAsElement"><ns2:SampleBeanBoolean>false</ns2:SampleBeanBoolean>

+<ns1:aBeanPortTypeBase xmlns:ns1="SameComplexTypeAndElementName"><Element xmlns:ns2="SameComplexTypeAsElement"><ns2:SampleBeanBoolean>false</ns2:SampleBeanBoolean>

 </Element>

 </ns1:aBeanPortTypeBase>

 </SOAP-ENV:Body>

@@ -18,13 +17,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: ""

-Content-Length: 460

+Content-Length: 459

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:aBeanPortTypeComplex xmlns:ns1="SameComplexTypeAndElementName">

-<Element xmlns:ns2="SameComplexTypeAsElement"><ns2:Boolean>false</ns2:Boolean>

+<ns1:aBeanPortTypeComplex xmlns:ns1="SameComplexTypeAndElementName"><Element xmlns:ns2="SameComplexTypeAsElement"><ns2:Boolean>false</ns2:Boolean>

 </Element>

 </ns1:aBeanPortTypeComplex>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/SameComplexTypeAndNillableElementName_Request.expected b/tests/auto_build/testcases/output/SameComplexTypeAndNillableElementName_Request.expected
index 9d9cbac..889a88e 100644
--- a/tests/auto_build/testcases/output/SameComplexTypeAndNillableElementName_Request.expected
+++ b/tests/auto_build/testcases/output/SameComplexTypeAndNillableElementName_Request.expected
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "Calculator#add"

-Content-Length: 458

+Content-Length: 457

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:complexTypeAndNillableElement xmlns:ns1="http://localhost/axis/Calculator">

-<ns1:Element><ns1:aType xsi:nil="true"></ns1:aType>

+<ns1:complexTypeAndNillableElement xmlns:ns1="http://localhost/axis/Calculator"><ns1:Element><ns1:aType xsi:nil="true"></ns1:aType>

 </ns1:Element>

 </ns1:complexTypeAndNillableElement>

 </SOAP-ENV:Body>

diff --git a/tests/auto_build/testcases/output/TestSoapHeaderBlock2Request.out b/tests/auto_build/testcases/output/TestSoapHeaderBlock2Request.out
index 732eb38..587b827 100644
--- a/tests/auto_build/testcases/output/TestSoapHeaderBlock2Request.out
+++ b/tests/auto_build/testcases/output/TestSoapHeaderBlock2Request.out
@@ -2,14 +2,13 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: ""
-Content-Length: 803
+Content-Length: 802
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Header><ns2:TestHeader1 xmlns:ns2="http://ws.apache.org/axisCppTest/"><Credentials1><username1>Test User1</username1><password1>Test Password1</password1></Credentials1></ns2:TestHeader1><ns3:TestHeader2 xmlns:ns3="http://ws.apache.org/axisCppTest/"><Credentials2><username2>Test User2</username2><password2>Test Password2</password2><Key>Test Key</Key></Credentials2></ns3:TestHeader2></SOAP-ENV:Header>
 <SOAP-ENV:Body>
-<ns1:div xmlns:ns1="http://soapinterop.org">
-<ns1:arg_0_0>15</ns1:arg_0_0>
+<ns1:div xmlns:ns1="http://soapinterop.org"><ns1:arg_0_0>15</ns1:arg_0_0>
 <ns1:arg_1_0>5</ns1:arg_1_0>
 </ns1:div>
 </SOAP-ENV:Body>
@@ -19,13 +18,12 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: ""
-Content-Length: 388
+Content-Length: 387
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:div xmlns:ns1="http://soapinterop.org">
-<ns1:arg_0_0>15</ns1:arg_0_0>
+<ns1:div xmlns:ns1="http://soapinterop.org"><ns1:arg_0_0>15</ns1:arg_0_0>
 <ns1:arg_1_0>5</ns1:arg_1_0>
 </ns1:div>
 </SOAP-ENV:Body>
diff --git a/tests/auto_build/testcases/output/TestSoapHeaderBlock3Request.out b/tests/auto_build/testcases/output/TestSoapHeaderBlock3Request.out
index 732eb38..587b827 100644
--- a/tests/auto_build/testcases/output/TestSoapHeaderBlock3Request.out
+++ b/tests/auto_build/testcases/output/TestSoapHeaderBlock3Request.out
@@ -2,14 +2,13 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: ""
-Content-Length: 803
+Content-Length: 802
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Header><ns2:TestHeader1 xmlns:ns2="http://ws.apache.org/axisCppTest/"><Credentials1><username1>Test User1</username1><password1>Test Password1</password1></Credentials1></ns2:TestHeader1><ns3:TestHeader2 xmlns:ns3="http://ws.apache.org/axisCppTest/"><Credentials2><username2>Test User2</username2><password2>Test Password2</password2><Key>Test Key</Key></Credentials2></ns3:TestHeader2></SOAP-ENV:Header>
 <SOAP-ENV:Body>
-<ns1:div xmlns:ns1="http://soapinterop.org">
-<ns1:arg_0_0>15</ns1:arg_0_0>
+<ns1:div xmlns:ns1="http://soapinterop.org"><ns1:arg_0_0>15</ns1:arg_0_0>
 <ns1:arg_1_0>5</ns1:arg_1_0>
 </ns1:div>
 </SOAP-ENV:Body>
@@ -19,13 +18,12 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: ""
-Content-Length: 388
+Content-Length: 387
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:div xmlns:ns1="http://soapinterop.org">
-<ns1:arg_0_0>15</ns1:arg_0_0>
+<ns1:div xmlns:ns1="http://soapinterop.org"><ns1:arg_0_0>15</ns1:arg_0_0>
 <ns1:arg_1_0>5</ns1:arg_1_0>
 </ns1:div>
 </SOAP-ENV:Body>
diff --git a/tests/auto_build/testcases/output/TestSoapHeaderBlockRequest.out b/tests/auto_build/testcases/output/TestSoapHeaderBlockRequest.out
index 2bc4c97..aa9e866 100644
--- a/tests/auto_build/testcases/output/TestSoapHeaderBlockRequest.out
+++ b/tests/auto_build/testcases/output/TestSoapHeaderBlockRequest.out
@@ -2,14 +2,13 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: ""
-Content-Length: 594
+Content-Length: 593
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Header><th1:TestHeader xmlns:th1="http://ws.apache.org/axisCppTest/"><Credentials><username>Test User</username><password>Test Password</password></Credentials></th1:TestHeader></SOAP-ENV:Header>
 <SOAP-ENV:Body>
-<ns1:div xmlns:ns1="http://soapinterop.org">
-<ns1:arg_0_0>15</ns1:arg_0_0>
+<ns1:div xmlns:ns1="http://soapinterop.org"><ns1:arg_0_0>15</ns1:arg_0_0>
 <ns1:arg_1_0>5</ns1:arg_1_0>
 </ns1:div>
 </SOAP-ENV:Body>
@@ -19,13 +18,12 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: ""
-Content-Length: 388
+Content-Length: 387
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:div xmlns:ns1="http://soapinterop.org">
-<ns1:arg_0_0>15</ns1:arg_0_0>
+<ns1:div xmlns:ns1="http://soapinterop.org"><ns1:arg_0_0>15</ns1:arg_0_0>
 <ns1:arg_1_0>5</ns1:arg_1_0>
 </ns1:div>
 </SOAP-ENV:Body>
diff --git a/tests/auto_build/testcases/output/TestTransportProtocolRequest.out b/tests/auto_build/testcases/output/TestTransportProtocolRequest.out
index 7432deb..2dfb09e 100644
--- a/tests/auto_build/testcases/output/TestTransportProtocolRequest.out
+++ b/tests/auto_build/testcases/output/TestTransportProtocolRequest.out
@@ -2,13 +2,12 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: "Calculator#add"
-Content-Length: 397
+Content-Length: 396
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">
-<ns1:arg_0_0>2</ns1:arg_0_0>
+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>2</ns1:arg_0_0>
 <ns1:arg_1_0>3</ns1:arg_1_0>
 </ns1:add>
 </SOAP-ENV:Body>
@@ -18,13 +17,12 @@
 Host: localhost:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: "Calculator#add"
-Content-Length: 397
+Content-Length: 396
 
 <?xml version='1.0' encoding='utf-8' ?>
 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <SOAP-ENV:Body>
-<ns1:add xmlns:ns1="http://localhost/axis/Calculator">
-<ns1:arg_0_0>5</ns1:arg_0_0>
+<ns1:add xmlns:ns1="http://localhost/axis/Calculator"><ns1:arg_0_0>5</ns1:arg_0_0>
 <ns1:arg_1_0>6</ns1:arg_1_0>
 </ns1:add>
 </SOAP-ENV:Body>
diff --git a/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected b/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected
index d7f6c4e..7393b5e 100644
--- a/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected
+++ b/tests/auto_build/testcases/output/ValidXMLCharIsInterpretedAsCPPCommand_Request.expected
@@ -2,13 +2,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "ValidXMLCharIsInterpretedAsCPPCommand#test1"

-Content-Length: 802

+Content-Length: 801

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:test1 xmlns:ns1="http://localhost/axis/ValidXMLCharIsInterpretedAsCPPCommand">

-<ns1:Element xmlns:ns2="ValidXMLCharIsInterpretedAsCPPCommandTypes"><ns2:arg.WithADot>1</ns2:arg.WithADot>

+<ns1:test1 xmlns:ns1="http://localhost/axis/ValidXMLCharIsInterpretedAsCPPCommand"><ns1:Element xmlns:ns2="ValidXMLCharIsInterpretedAsCPPCommandTypes"><ns2:arg.WithADot>1</ns2:arg.WithADot>

 <ns2:arg_WithAnUnderscore>2</ns2:arg_WithAnUnderscore>

 <ns2:arg-WithAHyphen>3</ns2:arg-WithAHyphen>

 <ns2:arg:WithAColon>4</ns2:arg:WithAColon>

@@ -24,13 +23,12 @@
 Host: 127.0.0.1:13260

 Content-Type: text/xml; charset=UTF-8

 SOAPAction: "ValidXMLCharIsInterpretedAsCPPCommand#Test1WithComplexResponse"

-Content-Length: 840

+Content-Length: 839

 

 <?xml version='1.0' encoding='utf-8' ?>

 <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 <SOAP-ENV:Body>

-<ns1:Test1WithComplexResponse xmlns:ns1="http://localhost/axis/ValidXMLCharIsInterpretedAsCPPCommand">

-<ns1:Element xmlns:ns2="ValidXMLCharIsInterpretedAsCPPCommandTypes"><ns2:arg.WithADot>1</ns2:arg.WithADot>

+<ns1:Test1WithComplexResponse xmlns:ns1="http://localhost/axis/ValidXMLCharIsInterpretedAsCPPCommand"><ns1:Element xmlns:ns2="ValidXMLCharIsInterpretedAsCPPCommandTypes"><ns2:arg.WithADot>1</ns2:arg.WithADot>

 <ns2:arg_WithAnUnderscore>2</ns2:arg_WithAnUnderscore>

 <ns2:arg-WithAHyphen>3</ns2:arg-WithAHyphen>

 <ns2:arg:WithAColon>4</ns2:arg:WithAColon>