Fix tox.ini and clean up/update tests