diff --git a/livesupport/modules/storage/etc/storageClient.xml b/livesupport/modules/storage/etc/storageClient.xml
index 03f5ff855..a6d97f42d 100644
--- a/livesupport/modules/storage/etc/storageClient.xml
+++ b/livesupport/modules/storage/etc/storageClient.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE storageClientFactory [
 
-<!ELEMENT storageClientFactory (testStorage, webStorage) >
+<!ELEMENT storageClientFactory (testStorage|webStorage) >
 
-<!ELEMENT testStorage (playlist*) >
+<!ELEMENT testStorage (playlist*, audioClip*) >
 <!ATTLIST testStorage tempFiles CDATA       #REQUIRED >
 
 <!ELEMENT playlist (playlistElement*) >
 <!ATTLIST playlist id           NMTOKEN     #REQUIRED >
 <!ATTLIST playlist playlength   NMTOKEN     #REQUIRED >
 
-<!ELEMENT playlistElement (audioClip) >
+<!ELEMENT playlistElement ((audioClip|playlist), fadeInfo?) >
 <!ATTLIST playlistElement id              NMTOKEN     #REQUIRED >
 <!ATTLIST playlistElement relativeOffset  NMTOKEN     #REQUIRED >
 
@@ -19,6 +19,11 @@
 <!ATTLIST audioClip playlength      NMTOKEN     #REQUIRED >
 <!ATTLIST audioClip uri             CDATA       #REQUIRED >
 
+<!ELEMENT fadeInfo EMPTY >
+<!ATTLIST fadeInfo id              NMTOKEN     #REQUIRED >
+<!ATTLIST fadeInfo fadeIn          NMTOKEN     #REQUIRED >
+<!ATTLIST fadeInfo fadeOut         NMTOKEN     #REQUIRED >
+
 <!ELEMENT webStorage (location) >
 <!ATTLIST webStorage tempFiles CDATA       #REQUIRED >
 
@@ -30,19 +35,35 @@
 ]>
 <storageClientFactory>
     <testStorage tempFiles="file:///tmp/tempPlaylist">
-        <playlist id="1" playlength="01:30:00.000">
-            <playlistElement id="101" relativeOffset="0" >
-                <audioClip id="10001" playlength="01:00:00.000" 
-                           uri="file:var/test1.mp3" />
+        <playlist id="1" playlength="00:00:34.000" >
+            <playlistElement id="101"    relativeOffset="0" >
+                <audioClip   id="10001"  playlength="00:00:11.000" 
+                             uri="file:var/test1.mp3" />
             </playlistElement>
-            <playlistElement id="102" relativeOffset="01:00:00.000" >
-                <audioClip id="10002"  playlength="00:30:00.000" 
-                           uri="file:var/test2.mp3" />
+            <playlistElement id="102"    relativeOffset="00:00:11.000000" >
+                <audioClip   id="10002"  playlength="00:00:12.000000" 
+                             uri="file:var/test2.mp3" /> 
+                <fadeInfo    id="9901"   fadeIn="00:00:02.000000" 
+                                         fadeOut="00:00:01.500000" />
+            </playlistElement>
+            <playlistElement id="103"    relativeOffset="00:00:23.000000" >
+                <playlist    id="2"      playlength="00:00:11.000000" > 
+                    <playlistElement id="111"    relativeOffset="0" >
+                        <audioClip   id="10003"  playlength="00:00:11.000" 
+                                     uri="file:var/test3.mp3" />
+                    </playlistElement>
+                </playlist>
             </playlistElement>
         </playlist>
+        <playlist    id="2"      playlength="00:00:11.000000" > 
+            <playlistElement id="111"    relativeOffset="0" >
+                <audioClip   id="10003"  playlength="00:00:11.000" 
+                                uri="file:var/test3.mp3" />
+            </playlistElement>
+        </playlist>
+        <audioClip id="10001" playlength="01:00:00.000" 
+                   uri="file:var/test1.mp3" />
+        <audioClip id="10002" playlength="00:30:00.000" 
+                   uri="file:var/test2.mp3" /> 
     </testStorage>
-    <webStorage tempFiles="file:///tmp/tempPlaylist" >
-    <location server="localhost" port="80" 
-              path="/storage/var/xmlrpc/xrLocStor.php" />
-    </webStorage>
 </storageClientFactory>
diff --git a/livesupport/modules/storage/etc/testStorage.xml b/livesupport/modules/storage/etc/testStorage.xml
index 11c4f2bf5..a671bc9d8 100644
--- a/livesupport/modules/storage/etc/testStorage.xml
+++ b/livesupport/modules/storage/etc/testStorage.xml
@@ -8,7 +8,7 @@
 <!ATTLIST playlist id           NMTOKEN     #REQUIRED >
 <!ATTLIST playlist playlength   NMTOKEN     #REQUIRED >
 
-<!ELEMENT playlistElement (audioClip) >
+<!ELEMENT playlistElement ((audioClip|playlist), fadeInfo?) >
 <!ATTLIST playlistElement id              NMTOKEN     #REQUIRED >
 <!ATTLIST playlistElement relativeOffset  NMTOKEN     #REQUIRED >
 
@@ -16,20 +16,43 @@
 <!ATTLIST audioClip id              NMTOKEN     #REQUIRED >
 <!ATTLIST audioClip playlength      NMTOKEN     #REQUIRED >
 <!ATTLIST audioClip uri             CDATA       #REQUIRED >
+
+<!ELEMENT fadeInfo EMPTY >
+<!ATTLIST fadeInfo id              NMTOKEN     #REQUIRED >
+<!ATTLIST fadeInfo fadeIn          NMTOKEN     #REQUIRED >
+<!ATTLIST fadeInfo fadeOut         NMTOKEN     #REQUIRED >
 ]>
 <testStorage tempFiles="file:///tmp/tempPlaylist">
-    <playlist id="1" playlength="01:30:00.000">
-        <playlistElement id="101" relativeOffset="0" >
-                <audioClip id="10001" playlength="01:00:00.000" 
-                           uri="file:var/test1.mp3" />
+    <playlist id="1" playlength="00:00:34.000" >
+        <playlistElement id="101"    relativeOffset="0" >
+            <audioClip   id="10001"  playlength="00:00:11.000" 
+                         uri="file:var/test10001.mp3" />
         </playlistElement>
-        <playlistElement id="102" relativeOffset="01:00:00.000" >
-                <audioClip id="10002"  playlength="00:30:00.000" 
-                           uri="file:var/test2.mp3" />
+        <playlistElement id="102"    relativeOffset="00:00:11.000000" >
+            <audioClip   id="10002"  playlength="00:00:12.000000" 
+                         uri="file:var/test10002.mp3" /> 
+            <fadeInfo    id="9901"   fadeIn="00:00:02.000000" 
+                                     fadeOut="00:00:01.500000" />
+        </playlistElement>
+        <playlistElement id="103"    relativeOffset="00:00:23.000000" >
+            <playlist    id="2"      playlength="00:00:11.000000" > 
+                <playlistElement id="111"    relativeOffset="0" >
+                    <audioClip   id="10003"  playlength="00:00:11.000" 
+                                 uri="file:var/test10003.mp3" />
+                </playlistElement>
+            </playlist>
+        </playlistElement>
+    </playlist>
+    <playlist    id="2"      playlength="00:00:11.000000" > 
+        <playlistElement id="111"    relativeOffset="0" >
+            <audioClip   id="10003"  playlength="00:00:11.000" 
+                            uri="file:var/test10003.mp3" />
         </playlistElement>
     </playlist>
     <audioClip id="10001" playlength="01:00:00.000" 
-               uri="file:var/test1.mp3" />
+               uri="file:var/test10001.mp3" />
     <audioClip id="10002" playlength="00:30:00.000" 
-               uri="file:var/test2.mp3" /> 
+               uri="file:var/test10002.mp3" /> 
+    <audioClip id="10003" playlength="00:30:00.000" 
+               uri="file:var/test10003.mp3" /> 
 </testStorage>
diff --git a/livesupport/modules/storage/src/TestStorageClientTest.cxx b/livesupport/modules/storage/src/TestStorageClientTest.cxx
index 376ecc943..99d28b6b3 100644
--- a/livesupport/modules/storage/src/TestStorageClientTest.cxx
+++ b/livesupport/modules/storage/src/TestStorageClientTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.14 $
+    Version  : $Revision: 1.15 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/src/TestStorageClientTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -159,7 +159,7 @@ TestStorageClientTest :: getAllPlaylistsTest(void)
 {
     Ptr<std::vector<Ptr<Playlist>::Ref> >::Ref
                         playlistVector = tsc->getAllPlaylists(dummySessionId);
-    CPPUNIT_ASSERT(playlistVector->size() == 1);
+    CPPUNIT_ASSERT(playlistVector->size() == 2);
 
     Ptr<Playlist>::Ref  playlist = (*playlistVector)[0];
     CPPUNIT_ASSERT((int) (playlist->getId()->getId()) == 1);
@@ -200,7 +200,7 @@ TestStorageClientTest :: audioClipTest(void)
     Ptr<std::vector<Ptr<AudioClip>::Ref> >::Ref
                             audioClipVector 
                             = tsc->getAllAudioClips(dummySessionId);
-    CPPUNIT_ASSERT(audioClipVector->size() == 2);
+    CPPUNIT_ASSERT(audioClipVector->size() == 3);
 
     audioClip = (*audioClipVector)[0];
     CPPUNIT_ASSERT((int) (audioClip->getId()->getId()) == 10001);
@@ -231,7 +231,7 @@ TestStorageClientTest :: acquireAudioClipTest(void)
     }
     string  audioClipUri("file://");
     audioClipUri += get_current_dir_name();
-    audioClipUri += "/var/test2.mp3";
+    audioClipUri += "/var/test10002.mp3";
     CPPUNIT_ASSERT(*(audioClip->getUri()) == audioClipUri);
     
     try {
diff --git a/livesupport/modules/storage/var/test1.mp3 b/livesupport/modules/storage/var/test10001.mp3
similarity index 100%
rename from livesupport/modules/storage/var/test1.mp3
rename to livesupport/modules/storage/var/test10001.mp3
diff --git a/livesupport/modules/storage/var/test2.mp3 b/livesupport/modules/storage/var/test10002.mp3
similarity index 100%
rename from livesupport/modules/storage/var/test2.mp3
rename to livesupport/modules/storage/var/test10002.mp3
diff --git a/livesupport/modules/storage/var/test3.mp3 b/livesupport/modules/storage/var/test10003.mp3
similarity index 100%
rename from livesupport/modules/storage/var/test3.mp3
rename to livesupport/modules/storage/var/test10003.mp3