Fix unit tests for Python 2