Fix tests for Py2.6