refacto tox file and test system