Tests pass in python 2.6 now