New tests, cleaning up, testing new coverage/tox settings