Test fixes for Python 2