Full coverage

As much as I hate mocking imports, I like having 100% coverage.
Lint fixes