Updated the test suite to help get it ready for Python 3.2.