Updated tests for compatibility with Python 2.6