Fixing coverage checker to reflect current test suite status
CS fixes in `src/`
CS fixes in the test suite