MAINT: Changes required for tests to pass in Python 2.6