Merged JValleroy's test updates.

The *user_store* tests can find the user_store module, and now the
tests fail for completely different reasons!

tests/user_store_test.py

@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- mode: python; mode: auto-fill; fill-column: 80 -*-
 
-import user_store
+import modules.user_store
 from logger import Logger
 import cfg
 import unittest
@@ -83,4 +83,4 @@ class UserStore(unittest.TestCase):
         return user
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()