diff --git a/livesupport/modules/storageServer/var/tests/mdata1.xml b/livesupport/modules/storageServer/var/tests/mdata1.xml
index f1d98a615..ac6fbdeb6 100644
--- a/livesupport/modules/storageServer/var/tests/mdata1.xml
+++ b/livesupport/modules/storageServer/var/tests/mdata1.xml
@@ -1,35 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audioClip>
-<metadata
-  xmlns="http://www.streamonthefly.org/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:dcterms="http://purl.org/dc/terms/"
-  xmlns:xbmf="http://www.streamonthefly.org/xbmf"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ <metadata
+   xmlns="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:dcterms="http://purl.org/dc/terms/"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
  >
-<dc:title  >File Title txt</dc:title>
-<dcterms:alternative  >Alternative File Title ín sőmé %$#@* LÁNGŰAGÉ</dcterms:alternative>
-<dc:subject  >Keywords: qwe, asd, zcx</dc:subject>
-<dc:description  >Abstract txt</dc:description>
-<dc:date  >2004-05-21</dc:date>
-<dcterms:available  >2004-05-22</dcterms:available>
-<dcterms:issued  >2004-05-23</dcterms:issued>
-<dcterms:modified  >2004-05-24</dcterms:modified>
-<dcterms:valid  >2004-05-25</dcterms:valid>
-<dc:type xsi:type="dcterms:DCMIType" >Sound</dc:type>
-<dc:format xsi:type="dcterms:IMT" >audio/mpeg</dc:format>
-<dcterms:extent  >00:00:03.000000</dcterms:extent>
-<dcterms:medium  >online</dcterms:medium>
-<dc:identifier  >streamonthefly:</dc:identifier>
-<dc:identifier  >http://some.url.mdlf.org/</dc:identifier>
-<dcterms:spatial  >Spatial Coverage</dcterms:spatial>
-<dcterms:temporal  >Temporal Covarage</dcterms:temporal>
-<xbmf:episodetitle  >Episode Title txt</xbmf:episodetitle>
-<xbmf:episodesequence  >Episode sequence</xbmf:episodesequence>
-<xbmf:contributor>
- <xbmf:role>Editor</xbmf:role>
- <xbmf:name>John X1</xbmf:name>
- <xbmf:phone>123456789</xbmf:phone>
-</xbmf:contributor>
-</metadata>
+  <dc:title>File Title txt</dc:title>
+  <dcterms:alternative>Alternative File Title ín sőmé %$#@* LÁNGŰAGÉ</dcterms:alternative>
+  <dc:subject>Keywords: qwe, asd, zcx</dc:subject>
+  <dc:description>Abstract txt</dc:description>
+  <dc:date>2004-05-21</dc:date>
+  <dc:format>audio/mpeg</dc:format>
+  <dcterms:extent>00:00:03.000000</dcterms:extent>
+<!--  <dcterms:medium>online</dcterms:medium>-->
+  <dc:identifier>gunid here</dc:identifier>
+  <dcterms:spatial>Spatial Coverage</dcterms:spatial>
+  <dcterms:temporal>Temporal Covarage</dcterms:temporal>
+  <dc:creator>John X1</dc:creator>
+ </metadata>
 </audioClip>
diff --git a/livesupport/modules/storageServer/var/tests/mdata10001.xml b/livesupport/modules/storageServer/var/tests/mdata10001.xml
index c18b426df..2364cfae3 100644
--- a/livesupport/modules/storageServer/var/tests/mdata10001.xml
+++ b/livesupport/modules/storageServer/var/tests/mdata10001.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audioClip>
 <metadata
-  xmlns="http://www.streamonthefly.org/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:dcterms="http://purl.org/dc/terms/"
-  xmlns:xbmf="http://www.streamonthefly.org/xbmf"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- >
-<dc:title  >one</dc:title>
-<dcterms:extent  >01:00:00.000000</dcterms:extent>
+   xmlns="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:dcterms="http://purl.org/dc/terms/"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+>
+ <dc:title>one</dc:title>
+ <dcterms:extent>01:00:00.000000</dcterms:extent>
 </metadata>
 </audioClip>
diff --git a/livesupport/modules/storageServer/var/tests/mdata10002.xml b/livesupport/modules/storageServer/var/tests/mdata10002.xml
index 460d47f8f..56b7941eb 100644
--- a/livesupport/modules/storageServer/var/tests/mdata10002.xml
+++ b/livesupport/modules/storageServer/var/tests/mdata10002.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audioClip>
 <metadata
-  xmlns="http://www.streamonthefly.org/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:dcterms="http://purl.org/dc/terms/"
-  xmlns:xbmf="http://www.streamonthefly.org/xbmf"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- >
-<dc:title  >two</dc:title>
-<dcterms:extent  >00:30:00.000000</dcterms:extent>
+   xmlns="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:dcterms="http://purl.org/dc/terms/"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
+>
+ <dc:title  >two</dc:title>
+ <dcterms:extent  >00:30:00.000000</dcterms:extent>
 </metadata>
 </audioClip>
diff --git a/livesupport/modules/storageServer/var/tests/mdata2.xml b/livesupport/modules/storageServer/var/tests/mdata2.xml
index 778d40ee9..71cdd336a 100644
--- a/livesupport/modules/storageServer/var/tests/mdata2.xml
+++ b/livesupport/modules/storageServer/var/tests/mdata2.xml
@@ -1,35 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audioClip>
 <metadata
-  xmlns="http://www.streamonthefly.org/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:dcterms="http://purl.org/dc/terms/"
-  xmlns:xbmf="http://www.streamonthefly.org/xbmf"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:dcterms="http://purl.org/dc/terms/"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
  >
-<dc:title  >File2 Title txt</dc:title>
-<dcterms:alternative  >Alternative File2 Title txt</dcterms:alternative>
-<dc:subject  >Keywords: qwe, asd, zcx</dc:subject>
-<dc:description  >Abstract txt</dc:description>
-<dc:date  >2004-05-21</dc:date>
-<dcterms:available  >2004-05-22</dcterms:available>
-<dcterms:issued  >2004-05-23</dcterms:issued>
-<dcterms:modified  >2004-05-24</dcterms:modified>
-<dcterms:valid  >2004-05-25</dcterms:valid>
-<dc:type xsi:type="dcterms:DCMIType" >Sound</dc:type>
-<dc:format xsi:type="dcterms:IMT" >audio/mpeg</dc:format>
-<dcterms:extent  >00:10:00.000000</dcterms:extent>
-<dcterms:medium  >online</dcterms:medium>
-<dc:identifier  >streamonthefly:</dc:identifier>
-<dc:identifier  >http://some.url.mdlf.org/</dc:identifier>
-<dcterms:spatial  >Spatial Coverage</dcterms:spatial>
-<dcterms:temporal  >Temporal Covarage</dcterms:temporal>
-<xbmf:episodetitle  >Episode Title txt</xbmf:episodetitle>
-<xbmf:episodesequence  >Episode sequence</xbmf:episodesequence>
-<xbmf:contributor>
- <xbmf:role>Author</xbmf:role>
- <xbmf:name>John X2</xbmf:name>
- <xbmf:phone>23456789</xbmf:phone>
-</xbmf:contributor>
+ <dc:title  >File2 Title txt</dc:title>
+ <dcterms:alternative  >Alternative File2 Title txt</dcterms:alternative>
+ <dc:subject  >Keywords: qwe, asd, zcx</dc:subject>
+ <dc:description  >Abstract txt</dc:description>
+ <dc:date  >2004-05-21</dc:date>
+ <dc:format>audio/mpeg</dc:format>
+ <dcterms:extent  >00:10:00.000000</dcterms:extent>
+<!-- <dcterms:medium  >online</dcterms:medium>-->
+ <dc:identifier  >gunid here</dc:identifier>
+ <dcterms:spatial  >Spatial Coverage</dcterms:spatial>
+ <dcterms:temporal  >Temporal Covarage</dcterms:temporal>
+ <dc:creator>John X2</dc:creator>
 </metadata>
 </audioClip>
diff --git a/livesupport/modules/storageServer/var/tests/mdata3.xml b/livesupport/modules/storageServer/var/tests/mdata3.xml
index f102aad28..692d19210 100644
--- a/livesupport/modules/storageServer/var/tests/mdata3.xml
+++ b/livesupport/modules/storageServer/var/tests/mdata3.xml
@@ -1,19 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audioClip>
     <metadata
-      xmlns="http://www.streamonthefly.org/"
-      xmlns:dc="http://purl.org/dc/elements/1.1/"
-      xmlns:dcterms="http://purl.org/dc/terms/"
-      xmlns:xbmf="http://www.streamonthefly.org/xbmf"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://mdlf.org/livesupport/elements/1.0/"
+       xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+       xmlns:dc="http://purl.org/dc/elements/1.1/"
+       xmlns:dcterms="http://purl.org/dc/terms/"
+       xmlns:xml="http://www.w3.org/XML/1998/namespace"
      >
         <dc:title  >Fil Title3 txt</dc:title>
         <dcterms:alternative  >Alternative File Title txt</dcterms:alternative>
         <dcterms:extent  >00:01:00.000000</dcterms:extent>
-        <xbmf:contributor>
-            <xbmf:role>Author</xbmf:role>
-            <xbmf:name>John Y</xbmf:name>
-            <xbmf:phone>345</xbmf:phone>
-        </xbmf:contributor>
+        <dc:creator>John Y</dc:creator>
     </metadata>
 </audioClip>
diff --git a/livesupport/modules/storageServer/var/tests/mdataVal1.xml b/livesupport/modules/storageServer/var/tests/mdataVal1.xml
index 131d4f8b8..2245f79d1 100644
--- a/livesupport/modules/storageServer/var/tests/mdataVal1.xml
+++ b/livesupport/modules/storageServer/var/tests/mdataVal1.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audioClip>
  <metadata
-   xmlns="http://www.streamonthefly.org/"
+   xmlns="http://mdlf.org/livesupport/elements/1.0/"
+   xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:dcterms="http://purl.org/dc/terms/"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:xml="http://www.w3.org/XML/1998/namespace"
   >
   <dc:title>File Title4 utf-8</dc:title>
   <dcterms:alternative>ěščřžýáíé ĚŠČŘŽÝÁÍÉ úůÚŮ ďťňĎŤŇ é</dcterms:alternative>
diff --git a/livesupport/modules/storageServer/var/tests/plist1.xml b/livesupport/modules/storageServer/var/tests/plist1.xml
index a6bfcddf6..6b0786949 100644
--- a/livesupport/modules/storageServer/var/tests/plist1.xml
+++ b/livesupport/modules/storageServer/var/tests/plist1.xml
@@ -4,17 +4,19 @@
     <playlistElement id="0000000000000101" relativeOffset="0" >
         <audioClip   id="0000000000010001" playlength="01:00:00.000000" 
                                            title="one"/>
+        <fadeinfo fadein="02.000000" fadeout="03.000000"
+            id="15015b4b70a054f1" />
     </playlistElement>
     <playlistElement id="0000000000000102" relativeOffset="01:00:00.000000" >
         <audioClip   id="0000000000010002" playlength="00:30:00.000000" 
                                            title="two"/>
     </playlistElement>
     <metadata
-      xmlns="http://www.streamonthefly.org/"
-      xmlns:dc="http://purl.org/dc/elements/1.1/"
-      xmlns:dcterms="http://purl.org/dc/terms/"
-      xmlns:xbmf="http://www.streamonthefly.org/xbmf"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://mdlf.org/livesupport/elements/1.0/"
+       xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+       xmlns:dc="http://purl.org/dc/elements/1.1/"
+       xmlns:dcterms="http://purl.org/dc/terms/"
+       xmlns:xml="http://www.w3.org/XML/1998/namespace"
      >
         <dc:title>My First Playlist</dc:title>
         <dc:creator>Me, myself and I</dc:creator>
diff --git a/livesupport/modules/storageServer/var/tests/wstream1.xml b/livesupport/modules/storageServer/var/tests/wstream1.xml
index f2bbe860d..42c4c560b 100644
--- a/livesupport/modules/storageServer/var/tests/wstream1.xml
+++ b/livesupport/modules/storageServer/var/tests/wstream1.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <audioclip>
-    <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:ls="http://mdlf.org/livesupport/elements/1.0/" xmlns:xml="http://www.w3.org/XML/1998/namespace" />
+    <metadata
+       xmlns="http://mdlf.org/livesupport/elements/1.0/"
+       xmlns:ls="http://mdlf.org/livesupport/elements/1.0/"
+       xmlns:dc="http://purl.org/dc/elements/1.1/"
+       xmlns:dcterms="http://purl.org/dc/terms/"
+       xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    >
+        <dc:title>Webstream test 1</dc:title>
+        <dcterms:extent>01:30:00.000000</dcterms:extent>
+    </metadata>
     <ls:url>http://localhost/y</ls:url>
 </audioclip>
diff --git a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
index 8b65399a5..a150e725a 100755
--- a/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
+++ b/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh
@@ -23,7 +23,7 @@
 #
 #
 #   Author   : $Author: tomas $
-#   Version  : $Revision: 1.24 $
+#   Version  : $Revision: 1.25 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/xmlrpc/testRunner.sh,v $
 #-------------------------------------------------------------------------------
 
@@ -34,15 +34,19 @@ COMM=$1
 shift
 GUNID=$1
 
-#METADATA="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-#<metadata><title>ěščřžé</title></metadata>"
 METADATA="<?xml version=\"1.0\"?>
-<audioClip><metadata xmlns=\"http://www.streamonthefly.org/\"
- xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
- xmlns:dcterms=\"http://purl.org/dc/terms/\">
-<dc:title>Media title testRunner</dc:title>
-<dcterms:extent>00:00:11</dcterms:extent>
-</metadata></audioClip>"
+<audioClip>
+<metadata
+   xmlns=\"http://mdlf.org/livesupport/elements/1.0/\"
+   xmlns:ls=\"http://mdlf.org/livesupport/elements/1.0/\"
+   xmlns:dc=\"http://purl.org/dc/elements/1.1/\"
+   xmlns:dcterms=\"http://purl.org/dc/terms/\"
+   xmlns:xml=\"http://www.w3.org/XML/1998/namespace\"
+>
+ <dc:title>Media title testRunner</dc:title>
+ <dcterms:extent>00:00:03.000000</dcterms:extent>
+</metadata>
+</audioClip>"
 
 echo ""
 XRDIR=`dirname $0`