Attempting to fix test failures with Python 2.x.