Remove traces of rfc822.
diff --git a/Lib/http/server.py b/Lib/http/server.py
index 2b6f135..35ade6c 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -315,7 +315,7 @@
 
         # Examine the headers and look for a Connection directive.
 
-        # MessageClass (rfc822) wants to see strings rather than bytes.
+        # MessageClass wants to see strings rather than bytes.
         # But a TextIOWrapper around self.rfile would buffer too many bytes
         # from the stream, bytes which we later need to read as bytes.
         # So we read the correct bytes here, as bytes, then use StringIO
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index e67f0d6..d59e6b1 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -131,7 +131,7 @@
 def quoteaddr(addr):
     """Quote a subset of the email addresses defined by RFC 821.
 
-    Should be able to handle anything rfc822.parseaddr can handle.
+    Should be able to handle anything email.utils.parseaddr can handle.
     """
     m = (None, None)
     try:
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 70eea04..8287877 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -140,6 +140,7 @@
 
     def test_easy(self):
         self.checkModule('pyclbr')
+        self.checkModule('ast')
         self.checkModule('doctest', ignore=("TestResults", "_SpoofOut"))
         self.checkModule('difflib', ignore=("Match",))