Fix tests for Python 3.x