Updated tests for python 2.6 compatibility