Test fix

Fixing tox tests and pep8 issues.