reorganised tests (added tox); cleanup