Fixed failing tests in Python 2.6