Second Attempt to get these tests working on python 2.6.