Fix up tests and tox