Fix tests for Py3.x
Add tox