Fix tests so that they'll pass on python 2.6 too.