Fixed test to support python 2.5 and 2.6