Properly redo tests for python 2.6