Update to get tests passing on python 2.6