Fix unit tests for Python 3