Fixed tests for Py2.6