Changed tests to be compatible both with and without tox