python 2.6 test refactoring