diff --git a/test/configurationTest.cpp b/test/configurationTest.cpp
index 8f10ceac96de448fd76bc405a0e27bfb210c1a32..d9c3a3675a10cb058414e9845e20d39b93f1726d 100644
--- a/test/configurationTest.cpp
+++ b/test/configurationTest.cpp
@@ -18,6 +18,7 @@
  */
 
 #include <stdio.h>
+#include <sstream>
 
 #include "configurationTest.h"
 
@@ -26,7 +27,7 @@ using std::endl;
 
 void ConfigurationTest::setUp(){
     // Load the default configuration
-    Manager::instance().initConfigFile(false);
+    Manager::instance().initConfigFile();
 }
 
 void ConfigurationTest::testDefaultValueAudio(){
@@ -63,7 +64,40 @@ void ConfigurationTest::testDefaultValueSignalisation(){
     CPPUNIT_ASSERT( Manager::instance().getConfigString( SIGNALISATION , SEND_DTMF_AS ) == SIP_INFO_STR );
 }
 
-void ConfigurationTest::testLoadAccountMap(){
+void ConfigurationTest::testLoadSIPAccount(){
+
+    AccountMap accounts;
+    Account *current;
+    std::ostringstream ss;
+
+    // Load the accounts from the user file
+    Manager::instance().loadAccountMap();  
+    // Save the account information
+    accounts = Manager::instance()._accountMap;
+    
+    AccountMap::iterator iter = accounts.begin(); 
+    while( iter != accounts.end() ){
+        current = iter->second;
+        CPPUNIT_ASSERT( iter->first == current->getAccountID() );
+        CPPUNIT_ASSERT( 0 ==  current->getVoIPLink() );
+        iter++;
+    }
+}    
+
+void ConfigurationTest::testUnloadSIPAccount(){
+
+    AccountMap accounts;
+
+    // Load the accounts from the user file
     Manager::instance().loadAccountMap();  
+    // Unload the accounts
+    Manager::instance().unloadAccountMap();
+    // Save the account information
+    accounts = Manager::instance()._accountMap;
+    
+    AccountMap::iterator iter = accounts.begin(); 
+    if( iter != accounts.end() ){
+        CPPUNIT_FAIL("Unload account map failed\n");
+    }
 }
 
diff --git a/test/configurationTest.h b/test/configurationTest.h
index 61109dc05af623043615497615f01c126474bebd..cdb891025fe3f061caf44ac8392e3f887ece90e7 100644
--- a/test/configurationTest.h
+++ b/test/configurationTest.h
@@ -48,7 +48,8 @@ class ConfigurationTest : public CppUnit::TestCase {
         CPPUNIT_TEST( testDefaultValueAudio );
         CPPUNIT_TEST( testDefaultValuePreferences );
         CPPUNIT_TEST( testDefaultValueSignalisation ); 
-        CPPUNIT_TEST( testLoadAccountMap );
+        CPPUNIT_TEST( testLoadSIPAccount );
+        CPPUNIT_TEST( testUnloadSIPAccount );
     CPPUNIT_TEST_SUITE_END();
 
     public:
@@ -80,7 +81,8 @@ class ConfigurationTest : public CppUnit::TestCase {
 
         void testDefaultValueSignalisation();
         
-        void testLoadAccountMap();
+        void testLoadSIPAccount();
+        void testUnloadSIPAccount();
 
 };