Fix violations
Improve code coverage