Make all tests pass with python3