Cleanup coveragerc, fix unit tests