Fix tox.ini and clean up/update tests

Now with 100% passing.