Dist clean up
Improving code coverage