Fix tests for Python 2