diff --git a/README.txt b/README.txt
index 28fd4f3..295405a 100755
--- a/README.txt
+++ b/README.txt
@@ -632,7 +632,7 @@ Let's add some more nodes and reorder them:
   >>> m114 = Node()
   >>> m11['m114'] = m114
   >>> m11.keys()
-  ['m111', 'm112', 'm113', 'm114']
+  [u'm111', u'm112', u'm113', u'm114']
 
 A special management view provides methods for moving objects down, up,
 to the bottom, and to the top.
@@ -641,10 +641,10 @@ to the bottom, and to the top.
   >>> view = OrderedContainerView(m11, TestRequest())
   >>> view.move_bottom(('m113',))
   >>> m11.keys()
-  ['m111', 'm112', 'm114', 'm113']
+  [u'm111', u'm112', u'm114', u'm113']
   >>> view.move_up(('m114',), 1)
   >>> m11.keys()
-  ['m111', 'm114', 'm112', 'm113']
+  [u'm111', u'm114', u'm112', u'm113']
 
 
 Breadcrumbs
diff --git a/browser/lobo/tests.py b/browser/lobo/tests.py
index c0a4e80..3509550 100755
--- a/browser/lobo/tests.py
+++ b/browser/lobo/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/classifier/tests.py b/classifier/tests.py
index 4e0a913..e3a7512 100755
--- a/classifier/tests.py
+++ b/classifier/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/compound/tests.py b/compound/tests.py
index f0f28ba..ed26281 100755
--- a/compound/tests.py
+++ b/compound/tests.py
@@ -2,7 +2,6 @@
 # Package loops.compound
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing import ztapi
 from zope.interface.verify import verifyClass
 
@@ -18,7 +17,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/config/tests.py b/config/tests.py
index 1b3d044..f1e56ee 100755
--- a/config/tests.py
+++ b/config/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -16,7 +14,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/constraint/tests.py b/constraint/tests.py
index 95f8a86..074e78a 100755
--- a/constraint/tests.py
+++ b/constraint/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing import ztapi
 from zope.interface.verify import verifyClass
 
@@ -17,7 +15,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/expert/tests.py b/expert/tests.py
index 4e63f95..f5f2453 100755
--- a/expert/tests.py
+++ b/expert/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 try:
     from loops.expert import query
@@ -23,8 +21,8 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
-                DocFileSuite('search.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('search.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/external/README.txt b/external/README.txt
index bcc1cf5..19b8a55 100644
--- a/external/README.txt
+++ b/external/README.txt
@@ -151,8 +151,8 @@ Writing object information to the external storage
   child(u'projects', u'customer', u'standard')...
   resource(u'doc04.txt', u'Document 4', u'textdocument', contentType='text/restructured')...
   resourceRelation(u'myquery', u'doc04.txt', u'standard')
-  node('home', u'Home', '', u'menu')
-  node('myquery', u'My Query', 'home', u'page', target=u'concepts/myquery')...
+  node(u'home', u'Home', '', u'menu')
+  node(u'myquery', u'My Query', u'home', u'page', target=u'concepts/myquery')...
 
 Writing sub-elements
 -------------------
diff --git a/external/tests.py b/external/tests.py
index 3f50aac..71d0415 100755
--- a/external/tests.py
+++ b/external/tests.py
@@ -1,8 +1,6 @@
-# $Id$
 
 import unittest, doctest
 import os
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -20,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/i18n/tests.py b/i18n/tests.py
index 6004b85..6f3b214 100755
--- a/i18n/tests.py
+++ b/i18n/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing import ztapi
 from zope.interface.verify import verifyClass
 
@@ -17,7 +15,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/integrator/content/tests.py b/integrator/content/tests.py
index 3e1f635..67180c0 100755
--- a/integrator/content/tests.py
+++ b/integrator/content/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/integrator/tests.py b/integrator/tests.py
index 1087054..f82b746 100755
--- a/integrator/tests.py
+++ b/integrator/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/knowledge/tests.py b/knowledge/tests.py
index 8340a79..8a23a33 100755
--- a/knowledge/tests.py
+++ b/knowledge/tests.py
@@ -5,7 +5,6 @@ import unittest, doctest
 from zope.app.testing import ztapi
 from zope import component
 from zope.interface.verify import verifyClass
-from zope.testing.doctestunit import DocFileSuite
 
 from loops.knowledge.qualification.base import Competence
 from loops.knowledge.survey.base import Questionnaire, Question, FeedbackItem
@@ -40,7 +39,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/layout/tests.py b/layout/tests.py
index aff0363..6e587c5 100755
--- a/layout/tests.py
+++ b/layout/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 from zope import component
 from loops.layout.base import NodeLayoutInstance, SubnodesLayoutInstance
@@ -24,7 +22,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/media/tests.py b/media/tests.py
index 57fd700..c135b0b 100644
--- a/media/tests.py
+++ b/media/tests.py
@@ -2,12 +2,9 @@
 
 """
 Tests for the 'loops.media' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -22,7 +19,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/organize/comment/tests.py b/organize/comment/tests.py
index c43ba30..50a1dfb 100755
--- a/organize/comment/tests.py
+++ b/organize/comment/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/organize/job/tests.py b/organize/job/tests.py
index 8a5ea94..2d6663f 100755
--- a/organize/job/tests.py
+++ b/organize/job/tests.py
@@ -1,8 +1,6 @@
-# $Id$
 
 import os
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 testDir = os.path.join(os.path.dirname(__file__), 'testdata')
@@ -19,7 +17,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/organize/personal/tests.py b/organize/personal/tests.py
index 91fa113..739b790 100755
--- a/organize/personal/tests.py
+++ b/organize/personal/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/organize/process/tests.py b/organize/process/tests.py
index a2e2e58..b5406a9 100755
--- a/organize/process/tests.py
+++ b/organize/process/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing import ztapi
 from zope.interface.verify import verifyClass
 from loops.organize.party import Person
@@ -17,7 +15,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/organize/stateful/tests.py b/organize/stateful/tests.py
index 169a064..853bce7 100755
--- a/organize/stateful/tests.py
+++ b/organize/stateful/tests.py
@@ -2,12 +2,9 @@
 
 """
 Tests for the 'loops.stateful' package.
-
-$Id$
 """
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -21,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
         unittest.makeSuite(Test),
-        DocFileSuite('README.txt', optionflags=flags),
+        doctest.DocFileSuite('README.txt', optionflags=flags),
         ))
 
 if __name__ == '__main__':
diff --git a/organize/tests.py b/organize/tests.py
index 6c9e22e..b0d5e9f 100755
--- a/organize/tests.py
+++ b/organize/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 from zope import component
@@ -85,7 +83,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/organize/tracking/tests.py b/organize/tracking/tests.py
index 7ce46eb..d980fb4 100755
--- a/organize/tracking/tests.py
+++ b/organize/tracking/tests.py
@@ -1,8 +1,6 @@
-# $Id$
 
 import os
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 testDir = os.path.join(os.path.dirname(__file__), 'testdata')
@@ -19,7 +17,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/organize/work/tests.py b/organize/work/tests.py
index 384ef4d..44257ab 100755
--- a/organize/work/tests.py
+++ b/organize/work/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/rest/tests.py b/rest/tests.py
index 70be7b1..cb0475a 100755
--- a/rest/tests.py
+++ b/rest/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/system/sync/tests.py b/system/sync/tests.py
index e294ff6..1ca6a20 100755
--- a/system/sync/tests.py
+++ b/system/sync/tests.py
@@ -1,8 +1,6 @@
-# $Id$
 
 import unittest, doctest
 import os
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 
 
@@ -20,7 +18,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/system/tests.py b/system/tests.py
index de0915c..342302c 100755
--- a/system/tests.py
+++ b/system/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 #from loops.versioning import versionable
 
@@ -16,7 +14,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/versioning/tests.py b/versioning/tests.py
index 198640f..b85f36a 100755
--- a/versioning/tests.py
+++ b/versioning/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.interface.verify import verifyClass
 from loops.versioning import versionable
 
@@ -16,7 +14,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':
diff --git a/xmlrpc/tests.py b/xmlrpc/tests.py
index 159d2ef..760aedd 100755
--- a/xmlrpc/tests.py
+++ b/xmlrpc/tests.py
@@ -1,7 +1,5 @@
-# $Id$
 
 import unittest, doctest
-from zope.testing.doctestunit import DocFileSuite
 
 
 class Test(unittest.TestCase):
@@ -15,7 +13,7 @@ def test_suite():
     flags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
     return unittest.TestSuite((
                 unittest.makeSuite(Test),
-                DocFileSuite('README.txt', optionflags=flags),
+                doctest.DocFileSuite('README.txt', optionflags=flags),
             ))
 
 if __name__ == '__main__':