Fixed issues with unit tests running in Python 2.5