Fixed broken test and Python 2.6 support fix