Add McCabe setting, omit tests from coverage
Add tests for recently added functions