diff --git a/ChangeLog b/ChangeLog
index e98512d25..45bce1ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 ChangeLog for PyLint
 ====================
 	
- --
-2009-03-16 -- 0.17
-    * remove rpython : remove all rpython checker, modules and tests
-    * astng0.18 compatibility: support for _ast module modifies interfaces
 
-2009-01-28 -- 0.16
+ -- 
+    * semicolon check : move W0601 to W0301
+    * remove rpython : remove all rpython checker, modules and tests
+    * astng 0.18 compatibility: support for _ast module modifies interfaces
+
+2009-01-28 -- 0.16.0
     * change [en|dis]able-msg-cat options: only accept message categories
       identified by their first letter (eg IRCWEF) without the need for comma
       as separator
@@ -26,6 +27,7 @@ ChangeLog for PyLint
 	  status if any messages other then Information are issued
 	* fix #3711, #5626 (name resolution bug w/ decorator and class members)
 	* fix #6954
+
 2008-10-13  --  0.15.2
     * fix #5672: W0706 weirdness ( W0706 removed )
     * fix #5998: documentation points to wrong url for mailing list
diff --git a/test/test_func.py b/test/test_func.py
index 9133a7a65..0dfa2910c 100644
--- a/test/test_func.py
+++ b/test/test_func.py
@@ -157,7 +157,7 @@ def make_tests(filter_rgx):
         pyrestr = module_file.rsplit('_py', 1)[-1][:-3]
         if pyrestr.isdigit(): # '24', '25'...
             if sys.version_info < tuple([int(i) for i in pyrestr]):
-                print 'skip', module_file
+                #print 'skip', module_file
                 continue
         if not is_to_run(module_file):
             continue
diff --git a/test/test_import_graph.py b/test/test_import_graph.py
index 82199429f..7e08a564c 100644
--- a/test/test_import_graph.py
+++ b/test/test_import_graph.py
@@ -46,6 +46,9 @@ class ImportCheckerTC(unittest.TestCase):
         l.global_set_option('import-graph', 'import.dot')
         l.global_set_option('ext-import-graph', 'ext_import.dot')
         l.global_set_option('int-import-graph', 'int_import.dot')
+        l.global_set_option('int-import-graph', 'int_import.dot')
+        # ignore this file causing spurious MemoryError w/ some python version (>=2.3?)
+        l.global_set_option('ignore', ('func_unknown_encoding.py',))
         try:
             l.check('input')
             self.assert_(exists('import.dot'))
diff --git a/test/unittest_pyreverse_diadefs.py b/test/unittest_pyreverse_diadefs.py
index 013da83df..5d6135f54 100644
--- a/test/unittest_pyreverse_diadefs.py
+++ b/test/unittest_pyreverse_diadefs.py
@@ -124,16 +124,15 @@ class DefaultDiadefGeneratorTC(unittest.TestCase):
                                     {'node': True, 'name': 'Specialization'}]
                           )
 
+    _should_rels = [('association', 'DoNothing', 'Specialization'),
+                  ('implements', 'Ancestor', 'Interface'),
+                  ('specialization', 'Specialization', 'Ancestor')]
     def test_exctract_relations(self):
         """test extract_relations between classes"""
         cd = DefaultDiadefGenerator(Linker(PROJECT), HANDLER).visit(PROJECT)[1]
         cd.extract_relationships()
         relations = _process_relations(cd.relationships)
-        should = [('association', 'DoNothing', 'Specialization'),
-                  ('implements', 'Ancestor', 'Interface'),
-                  ('specialization', 'Specialization', 'Ancestor')]
-        self._relations = should
-        self.assertEquals(relations, should)
+        self.assertEquals(relations, self._should_rels)
 
     def test_functional_relation_extraction(self):
         """functional test of relations extraction;
@@ -145,7 +144,7 @@ class DefaultDiadefGeneratorTC(unittest.TestCase):
         diadefs = handler.get_diadefs(project, Linker(project, tag=True) )
         cd = diadefs[1]
         relations = _process_relations(cd.relationships)
-        self.assertEquals(relations, self._relations)
+        self.assertEquals(relations, self._should_rels)
 
     def test_known_values2(self):
         project = MANAGER.project_from_files(['data.clientmodule_test'], astng_wrapper)