Got all tests working on python 2.6 and 2.7