Fix again failing tests with Python 2