Py3k: Fixing tests.