Cleanup and better coverage
Test revision
pep8
Exclude from coverage