Changed tests to be python 2.6 compatible