Fixed tests for Python 2