made unit tests python 2.5 and 2.6 compliant