All tests now working with Python 2 and 3