Update for python 2.4 unit test compatibility