Addition Python 3 fixes
Python 3 fixes for tests