code coverage related refactoring