diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml
index dcef295a..42b54c3d 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/echo-response.xml
@@ -1,6 +1,6 @@
-
-
- Hello
-
+
+
+ Hello
+
\ No newline at end of file
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
index bb4c2dfc..cc711209 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/encrypted-soap.xml
@@ -1,48 +1,17 @@
-
-
-
-
-
-
-
-
-
-
- CN=client,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown
-
- 1196367787
-
-
-
-
-
-
- CtuWCgHBFl1zHdRU70e4aPoRwpMH8GMzWKmywSxdrMz4dS+hOexUu8sY2SUl0jdO+IfL/oNYj4eic7G6utkddKeOCHM8Rj7gtr2Elol2q1ZHXc5N1DUk99t7dYs+XmMU2ULqyGh0T0rmhbABmbxZDB4NzwCBFvXxEUUFFBbN460=
-
-
-
-
-
-
-
-
-
-
-
- pqzkZJz0/RdUsf8y1z04PvWv48lYtrfmskeW8304PtXD2lXS2iGva5SlL7vc96aA6915zzyld4O0
- c+0ISwgvHnharmwatlih/kGfHNY0/LBDidzsbbjrsMWFiq3MLy3x9Sj79pHnChd2BSw9D49kgtUN
- W8uIAUxLlsPqdSst9hEq/RYUk0M6mx8HBy2DnE3t36ifrB/1QnY4ohQoMrBARu4HIWidCxhajFSX
- i1ZNX8ff4RrD3JUoAlDX6J5zj3+YfxtaaZhoMXRshxAhJwoLidKGlFKN6gsZXqorDJ8ETZ6SdCJ3
- O2f4c+WW1xQLUdvt
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+CN=client,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown
+1196367787
+
+
+
+CtuWCgHBFl1zHdRU70e4aPoRwpMH8GMzWKmywSxdrMz4dS+hOexUu8sY2SUl0jdO+IfL/oNYj4eic7G6utkddKeOCHM8Rj7gtr2Elol2q1ZHXc5N1DUk99t7dYs+XmMU2ULqyGh0T0rmhbABmbxZDB4NzwCBFvXxEUUFFBbN460=
+pqzkZJz0/RdUsf8y1z04PvWv48lYtrfmskeW8304PtXD2lXS2iGva5SlL7vc96aA6915zzyld4O0
+c+0ISwgvHnharmwatlih/kGfHNY0/LBDidzsbbjrsMWFiq3MLy3x9Sj79pHnChd2BSw9D49kgtUN
+W8uIAUxLlsPqdSst9hEq/RYUk0M6mx8HBy2DnE3t36ifrB/1QnY4ohQoMrBARu4HIWidCxhajFSX
+i1ZNX8ff4RrD3JUoAlDX6J5zj3+YfxtaaZhoMXRshxAhJwoLidKGlFKN6gsZXqorDJ8ETZ6SdCJ3
+O2f4c+WW1xQLUdvt
\ No newline at end of file
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
index 92af9850..24c94297 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/signed-soap.xml
@@ -1,51 +1,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- I6X9SMGsJ5sOBL5NUM4H3KMTpc8=
-
-
-
-
- DX4XwuzPSkwTXIPKTWKXXf05PWssJjkFUVxg8Joj4OmB6yqDzzTJ1GHRI/3PFZLjoUQq7dL4JqAL
- BjcD2lb9ka0c/EILe59QtD1USz1jM8i/zAtNDv3J38yIIHeAp+v/zdT8cNAvG+unwpJvAYMaS34j
- mziXbS3/NLMFkroYR3Q=
-
-
-
-
-
- CN=client,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown
-
- 1196367787
-
-
-
-
-
-
-
-
-
- Hello
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+I6X9SMGsJ5sOBL5NUM4H3KMTpc8=
+
+
+
+DX4XwuzPSkwTXIPKTWKXXf05PWssJjkFUVxg8Joj4OmB6yqDzzTJ1GHRI/3PFZLjoUQq7dL4JqAL
+BjcD2lb9ka0c/EILe59QtD1USz1jM8i/zAtNDv3J38yIIHeAp+v/zdT8cNAvG+unwpJvAYMaS34j
+mziXbS3/NLMFkroYR3Q=
+
+
+
+
+CN=client,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown
+1196367787
+
+
+
+Hello
\ No newline at end of file
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
index 2a3b8a6f..98d82b7a 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenDigest-soap.xml
@@ -1,25 +1,6 @@
-
-
- Bert
- kwNstEaiFOrI7B31j7GuETYvdgk=
-
- 9mdsYDCrjjYRur0rxzYt2oD7
-
- 2006-06-01T23:48:42Z
-
-
-
-
-
+BertkwNstEaiFOrI7B31j7GuETYvdgk=9mdsYDCrjjYRur0rxzYt2oD72006-06-01T23:48:42Z
QQQ
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml
index 7e18e9dd..7c228e00 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainText-soap.xml
@@ -9,8 +9,7 @@
Bert
Ernie
-
+ >Ernie
diff --git a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
index 766cb216..111a52e9 100755
--- a/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
+++ b/security/src/test/resources/org/springframework/ws/soap/security/wss4j/usernameTokenPlainTextWithHeaders-soap.xml
@@ -1,6 +1,6 @@
-
- 1
+
+ 1
Bert
Ernie
-
+ >Ernie
-
+
2