More Python 3.x compatibility for tests.