--- a/test/unittest_rset.py	Tue Aug 11 17:27:27 2009 +0200
+++ b/test/unittest_rset.py	Wed Aug 12 18:05:19 2009 +0200
@@ -117,7 +117,7 @@
         rs.req = self.request()
         rs.vreg = self.vreg
         def test_filter(entity):
-            return entity.cwdb.login != 'nico'
+            return entity.login != 'nico'
 
         rs2 = rs.filtered_rset(test_filter)
         self.assertEquals(len(rs2), 2)
@@ -271,11 +271,11 @@
         self.assertEquals(pprelcachedict(e._related_cache),
                           [('created_by_subject', [5])])
         # first level of recursion
-        u = e.cwdb.created_by[0]
+        u = e.created_by[0]
         self.assertEquals(u['login'], 'admin')
         self.assertRaises(KeyError, u.__getitem__, 'firstname')
         # second level of recursion
-        s = u.cwdb.in_state[0]
+        s = u.in_state[0]
         self.assertEquals(s['name'], 'activated')
         self.assertRaises(KeyError, s.__getitem__, 'description')