tox with combined coverage
updated tests