Partial revert auf recent cleanup to make the tests run on Python 3.2 again