Changes to make sonar check the test coverage again