diff --git a/scopes/tests/tlib_storage.py b/scopes/tests/tlib_storage.py
index 67d3bff..fa8b386 100644
--- a/scopes/tests/tlib_storage.py
+++ b/scopes/tests/tlib_storage.py
@@ -4,6 +4,10 @@
 
 from datetime import datetime
 from scopes.storage import concept, folder, message, topic, tracking
+from scopes.util import keywords as k
+
+# predefine keywords used as domain, action, class head values in messages
+k('session system')
 
 
 def test_tracking(self, config):
diff --git a/scopes/tests/tlib_web.py b/scopes/tests/tlib_web.py
index d15f54c..227718b 100644
--- a/scopes/tests/tlib_web.py
+++ b/scopes/tests/tlib_web.py
@@ -42,7 +42,7 @@ def test_auth(self, config):
     logger.info('test_auth keys: %s', keys)
 
 def test_user_data(self, config):
-    from scopes.org import user
+    from scopes.web.auth import user
     u1 = user.User(login='tst9', email='tst9@example.com',
                    firstName='Test', lastName='User')
     xu1 = user.ExtUser(u1, idPrefix='test.')
diff --git a/scopes/org/user.py b/scopes/web/auth/user.py
similarity index 100%
rename from scopes/org/user.py
rename to scopes/web/auth/user.py