Fix tests for Python 3