Fixing tests for Python 2.7