SONAR-766 Expand coverage on core components