Fix unittest.
Automatic Py3k merge for testing