Testsuite: fixes for python2.6 support