Fix to unit tests to work with python 2.6