--- a/tests/lib/test_my_db.py	Tue Dec 30 22:32:10 2008 -0500
+++ b/tests/lib/test_my_db.py	Tue Dec 30 23:16:05 2008 -0500
@@ -1,10 +1,6 @@
-if __name__ == '__main__':
-    import sys
-    sys.path.insert(0, "../../lib")
-
+import testconfig
 import unittest
 import my_db
-import testconfig
 import pgdb
 
 class TestMyDbConnexion(unittest.TestCase):
@@ -19,22 +15,25 @@
     
     def tearDown(self):
         " Tear down the test-db environment"
-        self.db.delete_user('test')
+        self.db.delete_user(self.db.userid)
         pass
 
     def testConnect(self):
-        self.assertNotEqual(db, None)
-        self.assertNotEqual(db.userid, -1)
+        self.assertNotEqual(self.db, None)
+        self.assertNotEqual(self.db.userid, -1)
 
     def testGetPreferences(self):
         prefs = self.db.get_preferences()
-        self.assertEqual(prefs, self.prefs)
+	keys = prefs.keys()
+	keys.sort()
+	expKeys = self.prefs.keys()
+	expKeys.sort()
+        self.assertEqual(expKeys, keys)
 
     def testSetPreferences(self):
         self.db.set_preferences(self.prefs)
         prefs = self.db.get_preferences()
         self.assertEqual(prefs, self.prefs)
 
-
 if __name__ == '__main__':
     unittest.main()