diff --git a/livesupport/modules/authentication/src/AuthenticationClientFactory.cxx b/livesupport/modules/authentication/src/AuthenticationClientFactory.cxx
index 466ef3317..e881e9961 100644
--- a/livesupport/modules/authentication/src/AuthenticationClientFactory.cxx
+++ b/livesupport/modules/authentication/src/AuthenticationClientFactory.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/AuthenticationClientFactory.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -35,7 +35,7 @@
 
 #include "LiveSupport/Authentication/AuthenticationClientFactory.h"
 #include "TestAuthenticationClient.h"
-#include "LiveSupport/Authentication/WebAuthenticationClient.h"
+#include "WebAuthenticationClient.h"
 
 using namespace LiveSupport::Core;
 using namespace LiveSupport::Authentication;
diff --git a/livesupport/modules/authentication/src/WebAuthenticationClient.cxx b/livesupport/modules/authentication/src/WebAuthenticationClient.cxx
index 8efb2885c..8b1d82c0f 100644
--- a/livesupport/modules/authentication/src/WebAuthenticationClient.cxx
+++ b/livesupport/modules/authentication/src/WebAuthenticationClient.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.1 $
+    Version  : $Revision: 1.2 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClient.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -45,7 +45,7 @@
 #include <XmlRpcClient.h>
 #include <XmlRpcValue.h>
 
-#include "LiveSupport/Authentication/WebAuthenticationClient.h"
+#include "WebAuthenticationClient.h"
 
 using namespace boost::posix_time;
 using namespace XmlRpc;
diff --git a/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx b/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx
index 0a8724677..c2f1339ad 100644
--- a/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx
+++ b/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -113,6 +113,7 @@ WebAuthenticationClientTest :: firstTest(void)
 
     CPPUNIT_ASSERT(!(sessionId = wac->login("Piszkos Fred", "malnaszor")));
 
+    // TODO: this call writes some garbage to cerr; it should be told not to
     sessionId.reset(new SessionId("ceci n'est pas un session ID"));
     CPPUNIT_ASSERT(!wac->logout(sessionId));
     
diff --git a/livesupport/modules/authentication/src/WebAuthenticationClientTest.h b/livesupport/modules/authentication/src/WebAuthenticationClientTest.h
index bb55438c4..f2ed16f53 100644
--- a/livesupport/modules/authentication/src/WebAuthenticationClientTest.h
+++ b/livesupport/modules/authentication/src/WebAuthenticationClientTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.3 $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClientTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -42,7 +42,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include "LiveSupport/Authentication/WebAuthenticationClient.h"
+#include "WebAuthenticationClient.h"
 
 namespace LiveSupport {
 namespace Authentication {
@@ -61,7 +61,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the WebAuthenticationClient class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.3 $
+ *  @version $Revision: 1.4 $
  *  @see WebAuthenticationClient
  */
 class WebAuthenticationClientTest : public CPPUNIT_NS::TestFixture
diff --git a/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethodTest.h b/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethodTest.h
index 882a299d8..6e47087dc 100644
--- a/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/AddAudioClipToPlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the AddAudioClipToPlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see AddAudioClipToPlaylistMethod
  */
 class AddAudioClipToPlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class AddAudioClipToPlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/CreatePlaylistMethodTest.h b/livesupport/products/scheduler/src/CreatePlaylistMethodTest.h
index f4d05a96d..3eeb04ae7 100644
--- a/livesupport/products/scheduler/src/CreatePlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/CreatePlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.4 $
+    Version  : $Revision: 1.5 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/CreatePlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the CreatePlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.4 $
+ *  @version $Revision: 1.5 $
  *  @see CreatePlaylistMethod
  */
 class CreatePlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class CreatePlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/DeletePlaylistMethodTest.h b/livesupport/products/scheduler/src/DeletePlaylistMethodTest.h
index 2b6e3f2d8..c5b5f7be3 100644
--- a/livesupport/products/scheduler/src/DeletePlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/DeletePlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/DeletePlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -64,7 +64,7 @@ using namespace LiveSupport::Core;
  *
  *  @author  $Author: maroy, fgerlits
  $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see DeletePlaylistMethod
  */
 class DeletePlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -74,6 +74,8 @@ class DeletePlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(negativeTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+    
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/DisplayAudioClipMethodTest.h b/livesupport/products/scheduler/src/DisplayAudioClipMethodTest.h
index 9eaed664c..b65e937d0 100644
--- a/livesupport/products/scheduler/src/DisplayAudioClipMethodTest.h
+++ b/livesupport/products/scheduler/src/DisplayAudioClipMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayAudioClipMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the DisplayAudioClipMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see DisplayAudioClipMethod
  */
 class DisplayAudioClipMethodTest : public CPPUNIT_NS::TestFixture
@@ -73,6 +73,8 @@ class DisplayAudioClipMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(negativeTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/DisplayAudioClipsMethodTest.h b/livesupport/products/scheduler/src/DisplayAudioClipsMethodTest.h
index 6d6465855..97ffcec50 100644
--- a/livesupport/products/scheduler/src/DisplayAudioClipsMethodTest.h
+++ b/livesupport/products/scheduler/src/DisplayAudioClipsMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayAudioClipsMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the DisplayAudioClipsMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see DisplayAudioClipsMethod
  */
 class DisplayAudioClipsMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class DisplayAudioClipsMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/DisplayPlaylistMethodTest.h b/livesupport/products/scheduler/src/DisplayPlaylistMethodTest.h
index 77d806eb4..1bf12d947 100644
--- a/livesupport/products/scheduler/src/DisplayPlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/DisplayPlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayPlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the DisplayPlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see DisplayPlaylistMethod
  */
 class DisplayPlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -73,6 +73,8 @@ class DisplayPlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(negativeTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/DisplayPlaylistsMethodTest.h b/livesupport/products/scheduler/src/DisplayPlaylistsMethodTest.h
index 6c4a12f30..ef13e4370 100644
--- a/livesupport/products/scheduler/src/DisplayPlaylistsMethodTest.h
+++ b/livesupport/products/scheduler/src/DisplayPlaylistsMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayPlaylistsMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the DisplayPlaylistsMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see DisplayPlaylistsMethod
  */
 class DisplayPlaylistsMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class DisplayPlaylistsMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/DisplayScheduleMethodTest.h b/livesupport/products/scheduler/src/DisplayScheduleMethodTest.h
index d1515713c..f1a195f4b 100644
--- a/livesupport/products/scheduler/src/DisplayScheduleMethodTest.h
+++ b/livesupport/products/scheduler/src/DisplayScheduleMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/DisplayScheduleMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the DisplayScheduleMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see DisplayScheduleMethod
  */
 class DisplayScheduleMethodTest : public CPPUNIT_NS::TestFixture
@@ -73,6 +73,8 @@ class DisplayScheduleMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(intervalTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/GeneratePlayReportMethodTest.h b/livesupport/products/scheduler/src/GeneratePlayReportMethodTest.h
index 7a632962e..95aee885a 100644
--- a/livesupport/products/scheduler/src/GeneratePlayReportMethodTest.h
+++ b/livesupport/products/scheduler/src/GeneratePlayReportMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/GeneratePlayReportMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the GeneratePlayReportMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see GeneratePlayReportMethod
  */
 class GeneratePlayReportMethodTest : public CPPUNIT_NS::TestFixture
@@ -73,6 +73,8 @@ class GeneratePlayReportMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(intervalTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/OpenPlaylistForEditingMethodTest.h b/livesupport/products/scheduler/src/OpenPlaylistForEditingMethodTest.h
index 107539bfc..f46e17857 100644
--- a/livesupport/products/scheduler/src/OpenPlaylistForEditingMethodTest.h
+++ b/livesupport/products/scheduler/src/OpenPlaylistForEditingMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.4 $
+    Version  : $Revision: 1.5 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/OpenPlaylistForEditingMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the OpenPlaylistForEditingMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.4 $
+ *  @version $Revision: 1.5 $
  *  @see OpenPlaylistForEditingMethod
  */
 class OpenPlaylistForEditingMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class OpenPlaylistForEditingMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/PostgresqlPlayLogTest.cxx b/livesupport/products/scheduler/src/PostgresqlPlayLogTest.cxx
index bbaf7f0b5..b16df7d8c 100644
--- a/livesupport/products/scheduler/src/PostgresqlPlayLogTest.cxx
+++ b/livesupport/products/scheduler/src/PostgresqlPlayLogTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.1 $
+    Version  : $Revision: 1.2 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/PostgresqlPlayLogTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -89,10 +89,11 @@ PostgresqlPlayLogTest :: setUp(void)            throw ()
         
         playLog.reset(new PostgresqlPlayLog(cm));
         playLog->install();
-
-    } catch (std::invalid_argument &e) {
+    }
+    catch (std::invalid_argument &e) {
         CPPUNIT_FAIL("semantic error in configuration file");
-    } catch (xmlpp::exception &e) {
+    }
+    catch (xmlpp::exception &e) {
         CPPUNIT_FAIL("error parsing configuration file");
     }
 }
@@ -104,7 +105,14 @@ PostgresqlPlayLogTest :: setUp(void)            throw ()
 void
 PostgresqlPlayLogTest :: tearDown(void)         throw ()
 {
-    playLog->uninstall();
+    try {
+        playLog->uninstall();
+    }
+    catch (std::exception &e) {
+        std::string eMsg = "cannot uninstall playlog:\n";
+        eMsg += e.what();
+        CPPUNIT_FAIL(eMsg);
+    }
     playLog.reset();
     cm.reset();
 }
@@ -123,7 +131,8 @@ PostgresqlPlayLogTest :: firstTest(void)
 
     try {
         playLog->addPlayLogEntry(audioClipId, timestamp);
-    } catch (std::invalid_argument &e) {
+    }
+    catch (std::invalid_argument &e) {
         CPPUNIT_FAIL(e.what());
     }
 }
@@ -193,8 +202,8 @@ PostgresqlPlayLogTest :: getPlayLogEntriesTest(void)
         entries = playLog->getPlayLogEntries(fromTime, toTime);
 
         CPPUNIT_ASSERT(entries->size() == 0);
-
-    } catch (std::invalid_argument &e) {
+    }
+    catch (std::invalid_argument &e) {
         CPPUNIT_FAIL(e.what());
     }
 }
diff --git a/livesupport/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.h b/livesupport/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.h
index aefbd709d..4affa2a16 100644
--- a/livesupport/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RemoveAudioClipFromPlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the RemoveAudioClipFromPlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see RemoveAudioClipFromPlaylistMethod
  */
 class RemoveAudioClipFromPlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class RemoveAudioClipFromPlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/RemoveFromScheduleMethodTest.h b/livesupport/products/scheduler/src/RemoveFromScheduleMethodTest.h
index 4fdf3c3ee..c4881bdf5 100644
--- a/livesupport/products/scheduler/src/RemoveFromScheduleMethodTest.h
+++ b/livesupport/products/scheduler/src/RemoveFromScheduleMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RemoveFromScheduleMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the RemoveFromScheduleMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see RemoveFromScheduleMethod
  */
 class RemoveFromScheduleMethodTest : public CPPUNIT_NS::TestFixture
@@ -73,6 +73,8 @@ class RemoveFromScheduleMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(negativeTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the schedule factory.
          */
diff --git a/livesupport/products/scheduler/src/RescheduleMethodTest.h b/livesupport/products/scheduler/src/RescheduleMethodTest.h
index c62b4c9af..7610057a2 100644
--- a/livesupport/products/scheduler/src/RescheduleMethodTest.h
+++ b/livesupport/products/scheduler/src/RescheduleMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RescheduleMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the RescheduleMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see RescheduleMethod
  */
 class RescheduleMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class RescheduleMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the schedule factory.
          */
diff --git a/livesupport/products/scheduler/src/RevertEditedPlaylistMethodTest.h b/livesupport/products/scheduler/src/RevertEditedPlaylistMethodTest.h
index 442ce7bea..b17c182a2 100644
--- a/livesupport/products/scheduler/src/RevertEditedPlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/RevertEditedPlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RevertEditedPlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the RevertEditedPlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see RevertEditedPlaylistMethod
  */
 class RevertEditedPlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class RevertEditedPlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/SavePlaylistMethodTest.h b/livesupport/products/scheduler/src/SavePlaylistMethodTest.h
index f9fb91ac8..f9ced805f 100644
--- a/livesupport/products/scheduler/src/SavePlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/SavePlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/SavePlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the SavePlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see SavePlaylistMethod
  */
 class SavePlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class SavePlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/UpdateFadeInFadeOutMethodTest.h b/livesupport/products/scheduler/src/UpdateFadeInFadeOutMethodTest.h
index 5ffabdc00..29f9500a5 100644
--- a/livesupport/products/scheduler/src/UpdateFadeInFadeOutMethodTest.h
+++ b/livesupport/products/scheduler/src/UpdateFadeInFadeOutMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/UpdateFadeInFadeOutMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the UpdateFadeInFadeOutMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see UpdateFadeInFadeOutMethod
  */
 class UpdateFadeInFadeOutMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class UpdateFadeInFadeOutMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/UploadPlaylistMethodTest.h b/livesupport/products/scheduler/src/UploadPlaylistMethodTest.h
index 35126faf9..419f5cc76 100644
--- a/livesupport/products/scheduler/src/UploadPlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/UploadPlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.3 $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/UploadPlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the UploadPlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.3 $
+ *  @version $Revision: 1.4 $
  *  @see UploadPlaylistMethod
  */
 class UploadPlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -73,6 +73,8 @@ class UploadPlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(overlappingPlaylists);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/ValidatePlaylistMethodTest.h b/livesupport/products/scheduler/src/ValidatePlaylistMethodTest.h
index 13bc7e76b..ddae0e4a7 100644
--- a/livesupport/products/scheduler/src/ValidatePlaylistMethodTest.h
+++ b/livesupport/products/scheduler/src/ValidatePlaylistMethodTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.2 $
+    Version  : $Revision: 1.3 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/ValidatePlaylistMethodTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,7 +63,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the ValidatePlaylistMethod class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.2 $
+ *  @version $Revision: 1.3 $
  *  @see ValidatePlaylistMethod
  */
 class ValidatePlaylistMethodTest : public CPPUNIT_NS::TestFixture
@@ -72,6 +72,8 @@ class ValidatePlaylistMethodTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  The name of the configuration file for the storage client factory.
          */
diff --git a/livesupport/products/scheduler/src/XmlRpcToolsTest.h b/livesupport/products/scheduler/src/XmlRpcToolsTest.h
index b3bb96641..cdf1d6aa7 100644
--- a/livesupport/products/scheduler/src/XmlRpcToolsTest.h
+++ b/livesupport/products/scheduler/src/XmlRpcToolsTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.1 $
+    Version  : $Revision: 1.2 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/Attic/XmlRpcToolsTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -61,7 +61,7 @@ using namespace LiveSupport::Core;
  *  Unit test for the XmlRpcTools class.
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.1 $
+ *  @version $Revision: 1.2 $
  *  @see XmlRpcTools
  */
 class XmlRpcToolsTest : public CPPUNIT_NS::TestFixture
@@ -70,6 +70,8 @@ class XmlRpcToolsTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(firstTest);
     CPPUNIT_TEST_SUITE_END();
 
+    private:
+
         /**
          *  Configure a configurable with an XML file.
          *