tweaking tests, removing unittest.util for python2.6 support