REALLY fix tests on Py3k